From aea58b16dd72a3181d1fe92b07a6e22f7355f27d Mon Sep 17 00:00:00 2001 From: ibs Date: Mon, 1 Apr 2013 12:53:52 +0400 Subject: [PATCH] 0023861: Draw can not start if OCCT is installed in a path containing spaces --- samples/CSharp/msvc.bat | 10 +++++-- samples/CSharp/run.bat | 13 ++++++--- samples/mfc/standard/env.bat | 15 +++++----- samples/mfc/standard/msvc.bat | 13 ++++++--- samples/mfc/standard/run.bat | 29 ++++++++++--------- .../qt/IESample/generation-vc-projects.bat | 6 ++-- samples/qt/IESample/msvc.bat | 12 +++++--- samples/qt/IESample/run.bat | 18 ++++++------ .../qt/Tutorial/generation-vc-projects.bat | 6 ++-- samples/qt/Tutorial/msvc.bat | 12 +++++--- samples/qt/Tutorial/run.bat | 17 +++++------ samples/qt/VoxelDemo/msvc.bat | 9 ++++-- samples/qt/VoxelDemo/run.bat | 15 +++++----- 13 files changed, 100 insertions(+), 75 deletions(-) diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat index 6a8707d6bc..04e512ef04 100644 --- a/samples/CSharp/msvc.bat +++ b/samples/CSharp/msvc.bat @@ -1,3 +1,7 @@ -call ../../env.bat %1 %2 %3 -if not ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% %CASDEB% %~dp0IE\IE.sln -if ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% "" %~dp0IE\IE.sln \ No newline at end of file +call "%~dp0..\..\env.bat" %1 %2 %3 + +if ["%CASDEB%"] == [""] ( + call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0IE\IE.sln" +) else ( + call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0IE\IE.sln" +) \ No newline at end of file diff --git a/samples/CSharp/run.bat b/samples/CSharp/run.bat index 104ecef9ea..74b7bb03e3 100644 --- a/samples/CSharp/run.bat +++ b/samples/CSharp/run.bat @@ -1,4 +1,9 @@ -call ../../env.bat %1 %2 %3 -if not ["%CASDEB%"] == [""] set "BinDir=Debug" -if ["%CASDEB%"] == [""] set "BinDir=Release" -%~dp0IE\bin\%BinDir%\IE.exe \ No newline at end of file +call "%~dp0..\..\env.bat" %1 %2 %3 + +set "BinDir=Debug" + +if ["%CASDEB%"] == [""] ( + set "BinDir=Release" +) + +"%~dp0IE\bin\%BinDir%\IE.exe" \ No newline at end of file diff --git a/samples/mfc/standard/env.bat b/samples/mfc/standard/env.bat index 3c67be2629..068dcacf8e 100644 --- a/samples/mfc/standard/env.bat +++ b/samples/mfc/standard/env.bat @@ -1,9 +1,10 @@ -IF not "%CASDEB%" EQU "" ( -SET BIN_DIR=win%ARCH%\%VCVER%\bind -SET LIB_DIR=win%ARCH%\%VCVER%\libd -) ELSE ( -SET BIN_DIR=win%ARCH%\%VCVER%\bin -SET LIB_DIR=win%ARCH%\%VCVER%\lib + +set "BIN_DIR=win%ARCH%\%VCVER%\bind" +set "LIB_DIR=win%ARCH%\%VCVER%\libd" + +if ["%CASDEB%"] == [""] ( + set "BIN_DIR=win%ARCH%\%VCVER%\bin" + set "LIB_DIR=win%ARCH%\%VCVER%\lib" ) -SET PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%PATH% \ No newline at end of file +set "PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%PATH%" \ No newline at end of file diff --git a/samples/mfc/standard/msvc.bat b/samples/mfc/standard/msvc.bat index 7a4baac693..56c35e2f6a 100644 --- a/samples/mfc/standard/msvc.bat +++ b/samples/mfc/standard/msvc.bat @@ -1,4 +1,9 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat -if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% All-%VCVER%.sln -if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" All-%VCVER%.sln \ No newline at end of file +call "%~dp0..\..\..\env.bat" %1 %2 %3 + +call "%~dp0env.bat" + +if ["%CASDEB%"] == [""] ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0All-%VCVER%.sln" +) else ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0All-%VCVER%.sln" +) \ No newline at end of file diff --git a/samples/mfc/standard/run.bat b/samples/mfc/standard/run.bat index 8e604df0b9..afbacf5884 100644 --- a/samples/mfc/standard/run.bat +++ b/samples/mfc/standard/run.bat @@ -1,23 +1,24 @@ -echo %4 -if "%4" EQU "" ( +@echo off + +if ["%4"] == [""] ( echo Launch selected sample as follows: - echo Run.bat [^vc8^|^vc9^|^vc10^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^] + echo Run.bat [^vc8^|^vc9^|^vc10^|^vc11^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^] echo Use option -d to run Debug mode - EXIT /B + exit /B ) -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" -IF NOT EXIST %BIN_DIR%\%4.exe goto ERR_EXE +if not exist "%~dp0%BIN_DIR%\%4.exe" goto err_exe -start %BIN_DIR%\%4.exe +"%~dp0%BIN_DIR%\%4.exe" -GOTO END +goto eof -:ERR_EXE -ECHO Executable %BIN_DIR%\%~n1.exe not found." -ECHO Probably you didn't compile the application. -EXIT /B +:err_exe +echo Executable %~dp0%BIN_DIR%\%4.exe not found. +echo Probably you didn't compile the application. +exit /B -:END +:eof diff --git a/samples/qt/IESample/generation-vc-projects.bat b/samples/qt/IESample/generation-vc-projects.bat index 259981522b..b22d9295e6 100644 --- a/samples/qt/IESample/generation-vc-projects.bat +++ b/samples/qt/IESample/generation-vc-projects.bat @@ -5,8 +5,8 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10), REM second argument specifies architecture) (win32 or win64) REM third argument specifies Debug or Release mode -call .\..\..\..\env.bat %1 %2 %3 -call %~dp0env.bat +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" if not "%1" == "" ( if /I "%1" == "vc8" ( @@ -23,7 +23,7 @@ if not "%1" == "" ( set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" ) else ( echo Error: first argument ^(%1^) should specify supported version of Visual C++, - echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc10 ^(VS 2012^) + echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^) exit ) ) diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat index 075afd778f..4aa44bd2f6 100644 --- a/samples/qt/IESample/msvc.bat +++ b/samples/qt/IESample/msvc.bat @@ -1,4 +1,8 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat -if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% IESample-%VCVER%.sln -if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" IESample-%VCVER%.sln \ No newline at end of file +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" + +if ["%CASDEB%"] == [""] ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0IESample-%VCVER%.sln" +) else ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0IESample-%VCVER%.sln" +) \ No newline at end of file diff --git a/samples/qt/IESample/run.bat b/samples/qt/IESample/run.bat index 754c2eb145..14e0592a0b 100644 --- a/samples/qt/IESample/run.bat +++ b/samples/qt/IESample/run.bat @@ -1,21 +1,21 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" -IF not "%CASDEB%" EQU "" ( -SET BIN_DIR=win%ARCH%\%VCVER%\bind -) ELSE ( -SET BIN_DIR=win%ARCH%\%VCVER%\bin +set "BIN_DIR=win%ARCH%\%VCVER%\bind" + +IF ["%CASDEB%"] == [""] ( + set "BIN_DIR=win%ARCH%\%VCVER%\bin" ) -if not exist "%BIN_DIR%\IESample.exe" goto ERR_EXE +if not exist "%~dp0%BIN_DIR%\IESample.exe" goto ERR_EXE echo Starting IESample ..... -start /D "%BIN_DIR%" IESample.exe +"%~dp0%BIN_DIR%\IESample.exe" goto END :ERR_EXE -echo Executable %BIN_DIR%\IESample.exe not found." +echo Executable %~dp0%BIN_DIR%\IESample.exe not found. echo Probably you didn't compile the application. pause goto END diff --git a/samples/qt/Tutorial/generation-vc-projects.bat b/samples/qt/Tutorial/generation-vc-projects.bat index d6c7ee4769..03a1b81f2b 100644 --- a/samples/qt/Tutorial/generation-vc-projects.bat +++ b/samples/qt/Tutorial/generation-vc-projects.bat @@ -5,8 +5,8 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10), REM second argument specifies architecture) (win32 or win64) REM third argument specifies Debug or Release mode -call .\..\..\..\env.bat %1 %2 %3 -call %~dp0env.bat +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" if not "%1" == "" ( if /I "%1" == "vc8" ( @@ -23,7 +23,7 @@ if not "%1" == "" ( set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" ) else ( echo Error: first argument ^(%1^) should specify supported version of Visual C++, - echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc10 ^(VS 2012^) + echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^) exit ) ) diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat index d67dfad306..ae874b3f18 100644 --- a/samples/qt/Tutorial/msvc.bat +++ b/samples/qt/Tutorial/msvc.bat @@ -1,4 +1,8 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat -if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% Tutorial-%VCVER%.sln -if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" Tutorial-%VCVER%.sln \ No newline at end of file +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" + +if ["%CASDEB%"] == [""] ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0Tutorial-%VCVER%.sln" +) else ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0Tutorial-%VCVER%.sln" +) \ No newline at end of file diff --git a/samples/qt/Tutorial/run.bat b/samples/qt/Tutorial/run.bat index 77e423a187..125bf5a48d 100644 --- a/samples/qt/Tutorial/run.bat +++ b/samples/qt/Tutorial/run.bat @@ -1,21 +1,20 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat +call "%~dp0..\..\..\env.bat" %1 %2 %3 +call "%~dp0env.bat" -IF not "%CASDEB%" EQU "" ( -SET BIN_DIR=win%ARCH%\%VCVER%\bind -) ELSE ( -SET BIN_DIR=win%ARCH%\%VCVER%\bin +set "BIN_DIR=win%ARCH%\%VCVER%\bind" +if ["%CASDEB%"] == [""] ( + set "BIN_DIR=win%ARCH%\%VCVER%\bin" ) -if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE +if not exist "%~dp0%BIN_DIR%\Tutorial.exe" goto ERR_EXE echo Starting Tutorial ..... -start /D "%BIN_DIR%" Tutorial.exe +"%~dp0%BIN_DIR%\Tutorial.exe" goto END :ERR_EXE -echo Executable %BIN_DIR%\Tutorial.exe not found." +echo Executable %~dp0%BIN_DIR%\Tutorial.exe not found. echo Probably you didn't compile the application. pause goto END diff --git a/samples/qt/VoxelDemo/msvc.bat b/samples/qt/VoxelDemo/msvc.bat index a5b3b6c60d..019fe6b6cc 100644 --- a/samples/qt/VoxelDemo/msvc.bat +++ b/samples/qt/VoxelDemo/msvc.bat @@ -1,4 +1,7 @@ -call ../../../env.bat %1 %2 %3 +call "%~dp0..\..\..\env.bat" %1 %2 %3 -if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln -if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln \ No newline at end of file +if ["%CASDEB%"] == [""] ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0VoxelDemo-%VCVER%.sln" +) else ( + call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0VoxelDemo-%VCVER%.sln" +) \ No newline at end of file diff --git a/samples/qt/VoxelDemo/run.bat b/samples/qt/VoxelDemo/run.bat index 33b0b79c1c..665c08b711 100644 --- a/samples/qt/VoxelDemo/run.bat +++ b/samples/qt/VoxelDemo/run.bat @@ -1,20 +1,19 @@ -call ../../../env.bat %1 %2 %3 +call "%~dp0..\..\..\env.bat" %1 %2 %3 -IF not "%CASDEB%" EQU "" ( -SET BIN_DIR=Debug -) ELSE ( -SET BIN_DIR=Release +set "BIN_DIR=Debug" +if ["%CASDEB%"] == [""] ( + set "BIN_DIR=Release" ) -if not exist "%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE +if not exist "%~dp0%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE echo Starting VoxelDemo ..... -start /D "%BIN_DIR%" VoxelDemo.exe +"%~dp0%BIN_DIR%\VoxelDemo.exe" goto END :ERR_EXE -echo Executable %BIN_DIR%\VoxelDemo.exe not found." +echo Executable %~dp0%BIN_DIR%\VoxelDemo.exe not found. echo Probably you didn't compile the application. pause goto END