0027127: Implementation of compilation of OCCT Products samples on all platforms...

Removing old VC environment

diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat
index 9b2221a38a3fd6b2c78e3598a692c5168855098b..676c21b756ba1544f8646c9a918964c6a7a48347 100644 (file)
--- a/samples/CSharp/msvc.bat
+++ b/samples/CSharp/msvc.bat
@@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )

diff --git a/samples/CSharp/msvc_D3D.bat b/samples/CSharp/msvc_D3D.bat
index 2ce23b4a1891a927658d3f3d594f9ea013ccfcbf..3aa26ea014f0014ca094f1e08f8510774a4e844e 100644 (file)
--- a/samples/CSharp/msvc_D3D.bat
+++ b/samples/CSharp/msvc_D3D.bat
@@ -46,5 +46,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )

diff --git a/samples/CSharp/run.bat b/samples/CSharp/run.bat
index c67bd20eaa1ea82ddf073087bba064affbac70f0..25c48faa699d530702a766c126abb4705325cd8c 100644 (file)
--- a/samples/CSharp/run.bat
+++ b/samples/CSharp/run.bat
@@ -25,7 +25,7 @@ goto eof
 :err_bat
 echo Possible names of samples: WinForms, WPF_D3D, WPF_WinForms
 echo Launch selected sample as follows:
-echo   %~n0.bat [^vc8^|^vc9^|^vc10^|^vc11^|vc12] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
+echo   %~n0.bat [^vc10^|^vc11^|^vc12^|^vc14^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
 echo or
 echo   %~n0.bat [^SampleName^]
 echo Run %~n0.bat -h to get this help

diff --git a/samples/mfc/standard/ReadMe.md b/samples/mfc/standard/ReadMe.md
index 2754ba82226e7b25d7f2ae3e81cd81f2b3a26074..af8821643518aa56b5781eb0980b6518a1b3ff87 100644 (file)
--- a/samples/mfc/standard/ReadMe.md
+++ b/samples/mfc/standard/ReadMe.md
@@ -21,13 +21,13 @@ projects. When such project is rebuilt, all samples and *mfcsample* library are
 To run the Open CASCADE Technology samples, use command:
 
 ~~~~
-execute run.bat [vc8|vc9|vc10|vc11|vc12] [win32|win64] [Release|Debug] [SampleName]
+execute run.bat [vc10|vc11|vc12|vc14] [win32|win64] [Release|Debug] [SampleName]
 ~~~~
 
 To run the **Animation** sample, use command:
 
 ~~~~
-execute run.bat vc8 win32 Debug Animation
+execute run.bat vc10 win64 Debug Animation
 ~~~~
 
 
@@ -37,13 +37,13 @@ execute run.bat vc8 win32 Debug Animation
 You can modify, compile and launch all sample projects in MS Visual C++ at once with command:
 
 ~~~~  
-execute msvc.bat [vc8|vc9|vc10|vc11|vc12] [win32|win64] [Release|Debug]
+execute msvc.bat [vc10|vc11|vc12|vc14] [win32|win64] [Release|Debug]
 ~~~~
 
 To run all sample projects in MS Visual C++ at once, use command: 
 
 ~~~~
-execute msvc.bat vc8 win32 Debug
+execute msvc.bat vc10 win64 Debug
 ~~~~
 
 Note: make sure that your *PATH* environment variable contains a directory, where *msdev.exe* is located.
\ No newline at end of file

diff --git a/samples/mfc/standard/msvc.bat b/samples/mfc/standard/msvc.bat
index d2e1a0593885d52db9d57e777eacfc43982f96b4..99e8d421ce2dd258c5e9b8b2ad0be1bffff8321f 100644 (file)
--- a/samples/mfc/standard/msvc.bat
+++ b/samples/mfc/standard/msvc.bat
@@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )

diff --git a/samples/mfc/standard/run.bat b/samples/mfc/standard/run.bat
index 127176d2d30bd7cb12b1652f7ad434b0f0eec7c2..9d49105b8e4953b6e605801e78d028baa1fe6da4 100644 (file)
--- a/samples/mfc/standard/run.bat
+++ b/samples/mfc/standard/run.bat
@@ -24,7 +24,7 @@ goto eof
 
 :err_bat
 echo Launch selected sample as follows:
-echo   %~n0.bat [^vc8^|^vc9^|^vc10^|^vc11^|vc12] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
+echo   %~n0.bat [^vc10^|^vc11^|^vc12^|^vc14^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
 echo or
 echo   %~n0.bat [^SampleName^]
 echo Run %~n0.bat -h to get this help

diff --git a/samples/qt/FuncDemo/genproj.bat b/samples/qt/FuncDemo/genproj.bat
index d19fbf0d8ed854692cae3c35ed7dad8c5a3260c1..9ed28d854848bc6709cc63739688e2370329ab98 100644 (file)
--- a/samples/qt/FuncDemo/genproj.bat
+++ b/samples/qt/FuncDemo/genproj.bat
@@ -2,7 +2,7 @@
 REM Generation of vcproj files with qmake utilite
 REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
-REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
+REM Use first argument to specify version of Visual Studio (vc10, vc11, vc12 or vc14),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
@@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
         set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
-        echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)
+        echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
         exit
     )
 )

diff --git a/samples/qt/FuncDemo/msvc.bat b/samples/qt/FuncDemo/msvc.bat
index 1b3731bb53c2a2a4c6e48c887d86fbad75517684..8529956e6aaa53200ece794f773de5634b31f88b 100644 (file)
--- a/samples/qt/FuncDemo/msvc.bat
+++ b/samples/qt/FuncDemo/msvc.bat
@@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )

diff --git a/samples/qt/IESample/genproj.bat b/samples/qt/IESample/genproj.bat
index c24698b42c678f00b7f5da5baaa0e48064421d05..049ea3b5c8765eec04cd21aea517e56d5ff7d2bf 100644 (file)
--- a/samples/qt/IESample/genproj.bat
+++ b/samples/qt/IESample/genproj.bat
@@ -2,7 +2,7 @@
 REM Generation of vcproj files with qmake utilite
 REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
-REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
+REM Use first argument to specify version of Visual Studio (vc10, vc11, vc12 or vc14),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
@@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
         set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
-        echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)
+        echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2008 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
         exit
     )
 )

diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat
index cd003fbffa36b516c1c7512f1ca4b9a4bfbb4dc6..15794a10750ad9c993037c7b1970aee22e8a8171 100644 (file)
--- a/samples/qt/IESample/msvc.bat
+++ b/samples/qt/IESample/msvc.bat
@@ -10,11 +10,7 @@ set "PRJFILE=%~dp0IESample.sln"
 
 set "VisualStudioExpressName=VCExpress"
 
-if /I "%VCVER%" == "vc8" (
-  set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
-) else if /I "%VCVER%" == "vc9" (
-  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if /I "%VCVER%" == "vc10" (
+if /I "%VCVER%" == "vc10" (
   set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
 ) else if /I "%VCVER%" == "vc11" (
   set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
@@ -24,6 +20,9 @@ if /I "%VCVER%" == "vc8" (
 ) else if /I "%VCVER%" == "vc12" (
   set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
   set "VisualStudioExpressName=WDExpress"
+) else if /I "%VCVER%" == "vc14" (
+  set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
+  set "VisualStudioExpressName=WDExpress"
 ) else (
   echo Error: wrong VS identifier
   exit /B
@@ -36,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )

diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat
index c050d12d0de277bbbb032dea37ef3ac3943cf4ae..1b6e325e605af68821eb44c00875613420b4993e 100644 (file)
--- a/samples/qt/Tutorial/genproj.bat
+++ b/samples/qt/Tutorial/genproj.bat
@@ -2,7 +2,7 @@
 REM Generation of vcproj files with qmake utilite
 REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
-REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
+REM Use first argument to specify version of Visual Studio (vc10, vc11, vc12 or vc14),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
@@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
         set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
     ) else (
         echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
-        echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), vc10 ^(VS 2010^) or vc11 ^(VS 2012^)
+        echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
         exit
     )
 )

diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat
index 65262ca0c30a943182a0dfe35b093831a0f9b2ef..8254920754b76c4a7decc4a9ef212ef73ac9128b 100644 (file)
--- a/samples/qt/Tutorial/msvc.bat
+++ b/samples/qt/Tutorial/msvc.bat
@@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+  echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)
 )