From: apn Date: Wed, 19 Jul 2017 15:34:09 +0000 (+0300) Subject: 0028920: Samples - fix msvc.bat for building samples without CMake X-Git-Tag: V7_2_0_beta~23 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=48691eaa2c43383ee3a3e4d74e264e1c36b8ffc8 0028920: Samples - fix msvc.bat for building samples without CMake Added DevEnvDir to env.bat. Added window title to "start" command in msvc.bat files. --- diff --git a/adm/templates/env.bat b/adm/templates/env.bat index dfc842a678..11b788012c 100644 --- a/adm/templates/env.bat +++ b/adm/templates/env.bat @@ -52,6 +52,56 @@ if /I ["%3"] == ["relwithdeb"] set "CASDEB=i" rem Decode VCVER call "%~dp0adm\vcver.bat" +rem ----- Parsing of Visual Studio platform ----- +set "VisualStudioExpressName=VCExpress" + +if not "%DevEnvDir%" == "" ( + rem If DevEnvDir is already defined (e.g. in custom.bat), use that value +) else if /I "%VCFMT%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if /I "%VCFMT%" == "vc11" ( + set "DevEnvDir=%VS110COMNTOOLS%..\IDE" + rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop" + rem and has a new name for executable - WDExpress + set "VisualStudioExpressName=WDExpress" +) else if /I "%VCFMT%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) else if /I "%VCFMT%" == "vc14" ( + set "DevEnvDir=%VS140COMNTOOLS%..\IDE" +) else if /I "%VCFMT%" == "vc141" ( + for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do ( + set "DevEnvDir=%%i\Common7\IDE\" + ) +) else ( + echo Error: wrong VS identifier + exit /B +) + +rem ----- Parsing vcvarsall for qt samples and define PlatformToolset ----- +if /I "%VCFMT%" == "vc10" ( + set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" + set "VCPlatformToolSet=v100" +) else if /I "%VCFMT%" == "vc11" ( + set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" + set "VCPlatformToolSet=v110" +) else if /I "%VCFMT%" == "vc12" ( + set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" + set "VCPlatformToolSet=v120" +) else if /I "%VCFMT%" == "vc14" ( + set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" + set "VCPlatformToolSet=v140" +) else if /I "%VCFMT%" == "vc141" ( + for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do ( + set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat" + ) + set "VCPlatformToolSet=v141" +) else ( + echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++, + echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^) + exit +) + set "CSF_OPT_LIB32D=%CSF_OPT_LIB32%" set "CSF_OPT_LIB64D=%CSF_OPT_LIB64%" set "CSF_OPT_BIN32D=%CSF_OPT_BIN32%" diff --git a/adm/templates/msvc.bat b/adm/templates/msvc.bat index 72f43607da..e3d977bb33 100644 --- a/adm/templates/msvc.bat +++ b/adm/templates/msvc.bat @@ -10,35 +10,6 @@ if not "%4" == "" ( set "PRJFILE=%4" ) -set "VisualStudioExpressName=VCExpress" - -if not "%DevEnvDir%" == "" ( - rem If DevEnvDir is already defined (e.g. in custom.bat), use that value -) else if /I "%VCFMT%" == "vc8" ( - set "DevEnvDir=%VS80COMNTOOLS%..\IDE" -) else if /I "%VCFMT%" == "vc9" ( - set "DevEnvDir=%VS90COMNTOOLS%..\IDE" -) else if /I "%VCFMT%" == "vc10" ( - set "DevEnvDir=%VS100COMNTOOLS%..\IDE" -) else if /I "%VCFMT%" == "vc11" ( - set "DevEnvDir=%VS110COMNTOOLS%..\IDE" - rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop" - rem and has a new name for executable - WDExpress - set "VisualStudioExpressName=WDExpress" -) else if /I "%VCFMT%" == "vc12" ( - set "DevEnvDir=%VS120COMNTOOLS%..\IDE" - set "VisualStudioExpressName=WDExpress" -) else if /I "%VCFMT%" == "vc14" ( - set "DevEnvDir=%VS140COMNTOOLS%..\IDE" -) else if /I "%VCFMT%" == "vc141" ( - for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do ( - set DevEnvDir=%%i\Common7\IDE - ) -) else ( - echo Error: wrong VS identifier - exit /B -) - rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat index d3e0ae8da5..290a98109e 100644 --- a/samples/CSharp/msvc.bat +++ b/samples/CSharp/msvc.bat @@ -10,9 +10,9 @@ set "PRJFILE=%~dp0\CSharp.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCVER%^) 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 7632ff811a..9384467d67 100644 --- a/samples/CSharp/msvc_D3D.bat +++ b/samples/CSharp/msvc_D3D.bat @@ -21,9 +21,9 @@ set "PRJFILE=%~dp0\CSharp_D3D.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCVER%^) echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^) diff --git a/samples/mfc/standard/msvc.bat b/samples/mfc/standard/msvc.bat index b0f694d7b5..19d0f0b964 100644 --- a/samples/mfc/standard/msvc.bat +++ b/samples/mfc/standard/msvc.bat @@ -10,9 +10,9 @@ set "PRJFILE=%~dp0All-%VCFMT%.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCFMT%^) echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^) diff --git a/samples/qt/FuncDemo/msvc.bat b/samples/qt/FuncDemo/msvc.bat index 9d63d4d9e5..f6dce4a2ac 100644 --- a/samples/qt/FuncDemo/msvc.bat +++ b/samples/qt/FuncDemo/msvc.bat @@ -10,9 +10,9 @@ set "PRJFILE=%~dp0FuncDemo.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCVER%^) echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^) diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat index 47c1de5f0e..467a900d72 100644 --- a/samples/qt/IESample/msvc.bat +++ b/samples/qt/IESample/msvc.bat @@ -10,9 +10,9 @@ set "PRJFILE=%~dp0IESample.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCVER%^) echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^) diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat index e248270846..e428205044 100644 --- a/samples/qt/Tutorial/msvc.bat +++ b/samples/qt/Tutorial/msvc.bat @@ -10,9 +10,9 @@ set "PRJFILE=%~dp0Tutorial.sln" rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" ( - start "%DevEnvDir%\devenv.exe" "%PRJFILE%" + start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%" ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( - start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" + start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( echo Error: Could not find MS Visual Studio ^(%VCVER%^) echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)