From 693c4bbe605720e47fb9d351f4b5a58bc6db9dca Mon Sep 17 00:00:00 2001 From: bugmaster Date: Tue, 12 Jul 2016 15:44:10 +0300 Subject: [PATCH] 0027127: Implementation of compilation of OCCT Products samples on all platforms under support in Jenkins test system. Removing old VC environment --- samples/CSharp/msvc.bat | 2 +- samples/CSharp/msvc_D3D.bat | 2 +- samples/CSharp/run.bat | 2 +- samples/mfc/standard/ReadMe.md | 8 ++++---- samples/mfc/standard/msvc.bat | 2 +- samples/mfc/standard/run.bat | 2 +- samples/qt/FuncDemo/genproj.bat | 4 ++-- samples/qt/FuncDemo/msvc.bat | 2 +- samples/qt/IESample/genproj.bat | 4 ++-- samples/qt/IESample/msvc.bat | 11 +++++------ samples/qt/Tutorial/genproj.bat | 4 ++-- samples/qt/Tutorial/msvc.bat | 2 +- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat index 9b2221a38a..676c21b756 100644 --- 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 2ce23b4a18..3aa26ea014 100644 --- 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 c67bd20eaa..25c48faa69 100644 --- 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 2754ba8222..af88216435 100644 --- 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 d2e1a05938..99e8d421ce 100644 --- 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 127176d2d3..9d49105b8e 100644 --- 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 d19fbf0d8e..9ed28d8548 100644 --- 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 1b3731bb53..8529956e6a 100644 --- 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 c24698b42c..049ea3b5c8 100644 --- 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 cd003fbffa..15794a1075 100644 --- 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 c050d12d0d..1b6e325e60 100644 --- 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 65262ca0c3..8254920754 100644 --- 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^) )