X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=1fa82488b0b4598876337268699a7ee9b9d4d817;hb=46c384fb088c97355cb1266cc29bd9429bfa342f;hp=19981f6f0f0e4093eb013b7e5c04c3d18314e4b4;hpb=674f88d899c70d1e924037406f2db19fbfff053c;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index 19981f6f0..1fa82488b 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -1,7 +1,5 @@
 @echo off
 
-IF NOT EXIST "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" GOTO ERROR1
-
 @REM Load local settings from file localenv.bat that should be located in the root directory
 if "%ROOT_DIR%" == "" (
   set ROOT_DIR=%~dp0..
@@ -18,11 +16,6 @@ if "%SALOME_ROOT_DIR%" == "" (
   set SALOME_ROOT_DIR=%ROOT_DIR%\SALOME
 )
 
-if "%SOLVESPACE_ROOT_DIR%" == "" (
-  SET SOLVESPACE_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\solvespace-2.1
-)
-SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
-
 if "%PLANEGCS_ROOT_DIR%" == "" (
   SET PLANEGCS_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.18
 )
@@ -42,7 +35,13 @@ if "%BOOST_ROOT_DIR%" == "" (
 
 cd /d %SALOME_ROOT_DIR%\WORK
 call set_env.bat %1
-call "%PDIR%\env_compile.bat"
+
+if "%2" == "run" (
+  call "%PDIR%\env_launch.bat"
+) else (
+  call "%PDIR%\env_compile.bat"
+)
+
 cd /d %ROOT_DIR%
 
 @REM -------------------------
@@ -87,16 +86,18 @@ cd /d %ROOT_DIR%
 
 @SET _NO_DEBUG_HEAP=1
 
-IF "%ARCH%" == "Win64" (
-  call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-) ELSE (
-  IF "%ARCH%" == "Win32" (
-    call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-  ) ELSE (
-    echo Wrong architecture is used. Win32 or Win64 architecture is allowed only.
-    echo Refer to the set_env.bat script.
-  )
+@SET VC_VERSION_SHORT=15
+for /f "tokens=1,2*" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "%VC_VERSION_SHORT%.0" 2^>nul') do set "VSPATH=%%c"
+IF NOT EXIST "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" GOTO ERROR1
+
+if exist "%VSPATH%\Common7\IDE\devenv.exe"  (
+  SET msvc_exe=devenv
+) else if exist "%VSPATH%\Common7\IDE\VCExpress.exe"  (
+  SET msvc_exe=VCExpress
+) else (
+  GOTO ERROR1
 )
+call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 > NUL
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
@@ -104,3 +105,10 @@ REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\lib\python2.7\site-packages\salome\salome;
 REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%PYTHONPATH%
 
 @SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
+
+goto END
+
+:ERROR1
+ECHO "Visual Studio environment file is not found."
+
+:END