1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-09 18:50:54 +03:00

0027127: Implementation of compilation of OCCT Products samples on all platforms under support in Jenkins test system.

Removing old VC environment
This commit is contained in:
bugmaster 2016-07-12 15:44:10 +03:00
parent 6482df8152
commit 693c4bbe60
12 changed files with 22 additions and 23 deletions

View File

@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )

View File

@ -46,5 +46,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )

View File

@ -25,7 +25,7 @@ goto eof
:err_bat :err_bat
echo Possible names of samples: WinForms, WPF_D3D, WPF_WinForms echo Possible names of samples: WinForms, WPF_D3D, WPF_WinForms
echo Launch selected sample as follows: 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 or
echo %~n0.bat [^SampleName^] echo %~n0.bat [^SampleName^]
echo Run %~n0.bat -h to get this help echo Run %~n0.bat -h to get this help

View File

@ -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: 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: 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: 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: 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. Note: make sure that your *PATH* environment variable contains a directory, where *msdev.exe* is located.

View File

@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )

View File

@ -24,7 +24,7 @@ goto eof
:err_bat :err_bat
echo Launch selected sample as follows: 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 or
echo %~n0.bat [^SampleName^] echo %~n0.bat [^SampleName^]
echo Run %~n0.bat -h to get this help echo Run %~n0.bat -h to get this help

View File

@ -2,7 +2,7 @@
REM Generation of vcproj files with qmake utilite REM Generation of vcproj files with qmake utilite
REM Variable QTDIR and PATH to qmake executable must be defined without fail 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 second argument specifies architecture) (win32 or win64)
REM third argument specifies Debug or Release mode REM third argument specifies Debug or Release mode
@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
) else ( ) else (
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++, 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 exit
) )
) )

View File

@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )

View File

@ -2,7 +2,7 @@
REM Generation of vcproj files with qmake utilite REM Generation of vcproj files with qmake utilite
REM Variable QTDIR and PATH to qmake executable must be defined without fail 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 second argument specifies architecture) (win32 or win64)
REM third argument specifies Debug or Release mode REM third argument specifies Debug or Release mode
@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
) else ( ) else (
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++, 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 exit
) )
) )

View File

@ -10,11 +10,7 @@ set "PRJFILE=%~dp0IESample.sln"
set "VisualStudioExpressName=VCExpress" set "VisualStudioExpressName=VCExpress"
if /I "%VCVER%" == "vc8" ( if /I "%VCVER%" == "vc10" (
set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
) else if /I "%VCVER%" == "vc9" (
set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
) else if /I "%VCVER%" == "vc10" (
set "DevEnvDir=%VS100COMNTOOLS%..\IDE" set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
) else if /I "%VCVER%" == "vc11" ( ) else if /I "%VCVER%" == "vc11" (
set "DevEnvDir=%VS110COMNTOOLS%..\IDE" set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
@ -24,6 +20,9 @@ if /I "%VCVER%" == "vc8" (
) else if /I "%VCVER%" == "vc12" ( ) else if /I "%VCVER%" == "vc12" (
set "DevEnvDir=%VS120COMNTOOLS%..\IDE" set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress" set "VisualStudioExpressName=WDExpress"
) else if /I "%VCVER%" == "vc14" (
set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
set "VisualStudioExpressName=WDExpress"
) else ( ) else (
echo Error: wrong VS identifier echo Error: wrong VS identifier
exit /B exit /B
@ -36,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )

View File

@ -2,7 +2,7 @@
REM Generation of vcproj files with qmake utilite REM Generation of vcproj files with qmake utilite
REM Variable QTDIR and PATH to qmake executable must be defined without fail 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 second argument specifies architecture) (win32 or win64)
REM third argument specifies Debug or Release mode REM third argument specifies Debug or Release mode
@ -23,7 +23,7 @@ if not "%VCVER%" == "" (
set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
) else ( ) else (
echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++, 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 exit
) )
) )

View File

@ -35,5 +35,5 @@ if exist "%DevEnvDir%\devenv.exe" (
start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
) else ( ) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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^)
) )