0023861: Draw can not start if OCCT is installed in a path containing spaces

diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat
index 6a8707d6bc70a2f93cd38b9dcfc3b5a494546088..04e512ef045398be9f723cb67788ae578a78a352 100644 (file)
--- 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 104ecef9eac1d89712ad1192917b06e0bfe21506..74b7bb03e38a2cb2d63a4b3cd876393e8d29855d 100644 (file)
--- 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 3c67be26298312f19a5d8b11a85b6aaeb486742a..068dcacf8e268da9a0b81812d76f49d8400616af 100644 (file)
--- 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 7a4baac6931ee384ecf133104778fb7b1230eec5..56c35e2f6ab1d5f65b93fcb615a4c506dc1d3fd0 100644 (file)
--- 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 8e604df0b904e5d9a6984180c9b007865bb3b9f8..afbacf58847b196ff97ed47fbd740378528d1abf 100644 (file)
--- 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 259981522b6ec8dec23fc9686ac2e8fc9f059315..b22d9295e67199ca68e786983c09164a131c0518 100644 (file)
--- 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 075afd778f4785bfc16ebde793cf34d0b3a9fb9a..4aa44bd2f6de17d9dfb3bd2d431ce05df8ff13b9 100644 (file)
--- 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 754c2eb1457a846da9de6a424b3ac1b2c87d95b5..14e0592a0bc26be1aca9d3495c74f87faacc47b7 100644 (file)
--- 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 d6c7ee4769c4b44aff4b1aa6aeca74ef0c28ca1b..03a1b81f2ba6b16a91210a5b3708076974161850 100644 (file)
--- 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 d67dfad30665b52b14eb41acf13fc561013757ec..ae874b3f187838bf56fb10ce9f8839348b076e45 100644 (file)
--- 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 77e423a187f4580a576e2d1845ac70b3316b6dae..125bf5a48d271b8d6c81a5fb2ba2eeba8a4a5da0 100644 (file)
--- 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 a5b3b6c60dc670d59c89891bb319de7dfb77a158..019fe6b6ccd35dbb25fb0f75a6b728ef867a7551 100644 (file)
--- 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 33b0b79c1cb251efc287aa027507e026202071ea..665c08b71128ae1cce8445f89bda86ebfa8bbd4d 100644 (file)
--- 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