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 dfc842a6781310076d1cd6a21c93bddeeb0daf69..11b788012cc9a114e161c4f08f58a5074f4739b8 100644 (file)
--- 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 72f43607da303510455497c5e71f3c4a4c761752..e3d977bb33a7a4dd3a933aef79397668d1a24629 100644 (file)
--- 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 d3e0ae8da5731e9af6cb3de4c648cd5707d27ddd..290a98109e9bace6ced6eb5bdf8bb78dd732a2f2 100644 (file)
--- 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 7632ff811a78cad4e6c6039f88d27a4e76a02fc9..9384467d67dfea4d0ad7e05ab7334c92ec080cf3 100644 (file)
--- 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 b0f694d7b55542be662c2028fec4da18e0e307b3..19d0f0b9642d8050189f4b8ed5b24c36a60085a8 100644 (file)
--- 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 9d63d4d9e5ce751667738c997448cdbbae2addbe..f6dce4a2ac88552f34a31b4f116e4eda42429ba3 100644 (file)
--- 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 47c1de5f0eec4f4a40adef5504054c407bcd67a3..467a900d72b2b5b2299d7872108a3eb0ebe3c042 100644 (file)
--- 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 e2482708460e472c9186e14ba289c5fc1d5e9756..e42820504440893eb4c34088000dcad73c18d33b 100644 (file)
--- 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^)