From b3b55601fb31e7c769cc6e25e0eefca3cdb4d0ab Mon Sep 17 00:00:00 2001 From: ski Date: Fri, 8 May 2015 12:54:51 +0300 Subject: [PATCH] 0025490: Error appears trying to start QT OCCT sample Separate msvc.bat files were created for each qt sample to avoid errors. --- samples/qt/IESample/msvc.bat | 39 +++++++++++++++++++++++++++++++---- samples/qt/Tutorial/msvc.bat | 39 +++++++++++++++++++++++++++++++---- samples/qt/VoxelDemo/msvc.bat | 39 +++++++++++++++++++++++++++++++---- 3 files changed, 105 insertions(+), 12 deletions(-) diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat index eac8f9fe50..6631c5e350 100644 --- a/samples/qt/IESample/msvc.bat +++ b/samples/qt/IESample/msvc.bat @@ -1,7 +1,38 @@ +@echo off + +rem Setup environment call "%~dp0env.bat" %1 %2 %3 -if ["%CASDEB%"] == [""] ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0IESample-%VCVER%.sln" +rem Define path to project file +set "PRJFILE=%~dp0IESample-%VCVER%.sln" + +set "VisualStudioExpressName=VCExpress" + +if "%VCVER%" == "vc8" ( + set "DevEnvDir=%VS80COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc9" ( + set "DevEnvDir=%VS90COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "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 "%VCVER%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) 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%" +) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( + start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0IESample-%VCVER%.sln" -) \ No newline at end of file + echo Error: Could not find MS Visual Studio ^(%VCVER%^) + echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^) +) diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat index bd88eb624a..73f137aad8 100644 --- a/samples/qt/Tutorial/msvc.bat +++ b/samples/qt/Tutorial/msvc.bat @@ -1,7 +1,38 @@ +@echo off + +rem Setup environment call "%~dp0env.bat" %1 %2 %3 -if ["%CASDEB%"] == [""] ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0Tutorial-%VCVER%.sln" +rem Define path to project file +set "PRJFILE=%~dp0Tutorial-%VCVER%.sln" + +set "VisualStudioExpressName=VCExpress" + +if "%VCVER%" == "vc8" ( + set "DevEnvDir=%VS80COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc9" ( + set "DevEnvDir=%VS90COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "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 "%VCVER%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) 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%" +) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( + start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0Tutorial-%VCVER%.sln" -) \ No newline at end of file + echo Error: Could not find MS Visual Studio ^(%VCVER%^) + echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^) +) diff --git a/samples/qt/VoxelDemo/msvc.bat b/samples/qt/VoxelDemo/msvc.bat index 019fe6b6cc..cccdc4032d 100644 --- a/samples/qt/VoxelDemo/msvc.bat +++ b/samples/qt/VoxelDemo/msvc.bat @@ -1,7 +1,38 @@ +@echo off + +rem Setup environment call "%~dp0..\..\..\env.bat" %1 %2 %3 -if ["%CASDEB%"] == [""] ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0VoxelDemo-%VCVER%.sln" +rem Define path to project file +set "PRJFILE=%~dp0VoxelDemo-%VCVER%.sln" + +set "VisualStudioExpressName=VCExpress" + +if "%VCVER%" == "vc8" ( + set "DevEnvDir=%VS80COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc9" ( + set "DevEnvDir=%VS90COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "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 "%VCVER%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) 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%" +) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( + start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( - call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% %CASDEB% "%~dp0VoxelDemo-%VCVER%.sln" -) \ No newline at end of file + echo Error: Could not find MS Visual Studio ^(%VCVER%^) + echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^) +)