Update scripts for building SHAPER as SALOME module.

diff --git a/build_Salome_deb.bat b/build_Salome_deb.bat
index ddcc88b9b7b11c81c52c9554d4caa22e11597ead..3ab3aa812ee4f6297d3c7915a83625837b12fdd2 100644 (file)
--- a/build_Salome_deb.bat
+++ b/build_Salome_deb.bat
@@ -3,11 +3,11 @@
 REM Find absolute path to ROOT_DIR 
 @SET PARENT_DIR=%~dp0..
 @SET ROOT_DIR=
-pushd %PARENT_DIR%
+pushd %PARENT_DIR%\..
 @SET ROOT_DIR=%CD%
 popd
 
-@SET SRC_DIR=%ROOT_DIR%\sources
+@SET SRC_DIR=%ROOT_DIR%\sources\shaper
 @SET OCC_LIB_PREFIX=d
 
 call %SRC_DIR%\env_Salome.bat d
@@ -15,6 +15,6 @@ mkdir %ROOT_DIR%\build
 cd %ROOT_DIR%\build
 
 REM Add -DADD_MODELS_TESTS=TRUE to enable test models
-cmake %SRC_DIR% -G "Visual Studio 10 Win64" -DPYTHON_EXECUTABLE=%PYTHONHOME%\python.exe -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
+cmake %SRC_DIR% -G "Visual Studio 14 Win64" -DPYTHON_EXECUTABLE=%PYTHONHOME%\python_d.exe -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
 
 start "" %MSVC_EXE% SHAPER.sln

diff --git a/build_Salome_rel.bat b/build_Salome_rel.bat
index 849f62acde1327c102303da136a304d95da1e349..65c1439ba1a45acda3a7669ee1779026907e2c2e 100644 (file)
--- a/build_Salome_rel.bat
+++ b/build_Salome_rel.bat
@@ -3,16 +3,17 @@
 REM Find absolute path to ROOT_DIR 
 @SET PARENT_DIR=%~dp0..
 @SET ROOT_DIR=
-pushd %PARENT_DIR%
+pushd %PARENT_DIR%\..
 @SET ROOT_DIR=%CD%
 popd
 
-@SET SRC_DIR=%ROOT_DIR%\sources
+@SET SRC_DIR=%ROOT_DIR%\sources\shaper
 
 call %SRC_DIR%\env_Salome.bat
 mkdir %ROOT_DIR%\build
 cd %ROOT_DIR%\build
 
-cmake %SRC_DIR% -G "Visual Studio 10 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
+REM Add -DADD_MODELS_TESTS=TRUE to enable test models
+cmake %SRC_DIR% -G "Visual Studio 14 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
 
 start "" %MSVC_EXE% SHAPER.sln

diff --git a/env_Salome.bat b/env_Salome.bat
index 416599222e367fb8522d2239306d4ec69da973ac..19981f6f0f0e4093eb013b7e5c04c3d18314e4b4 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -1,6 +1,6 @@
 @echo off
 
-IF NOT EXIST "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" GOTO ERROR1
+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%" == "" (
@@ -24,7 +24,7 @@ if "%SOLVESPACE_ROOT_DIR%" == "" (
 SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 
 if "%PLANEGCS_ROOT_DIR%" == "" (
-  SET PLANEGCS_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.16
+  SET PLANEGCS_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.18
 )
 SET PATH=%PLANEGCS_ROOT_DIR%\lib;%PATH%
 
@@ -34,9 +34,9 @@ if "%EIGEN_ROOT_DIR%" == "" (
 
 if "%BOOST_ROOT_DIR%" == "" (
   if "SALOME_ROOT_DIR" == "" (
-    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.67.0
   ) else (
-    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.67.0
   )
 )
 
@@ -53,8 +53,8 @@ cd /d %ROOT_DIR%
 
 @REM -------------------------
 @REM CASCADE
-@SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH%
-@SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB%
+@SET PATH=%CASROOT%;%CASROOT%\win64\vc14\bin%OCC_LIB_PREFIX%;%PATH%
+@SET LIB=%CASROOT%\win64\vc14\lib%OCC_LIB_PREFIX%;%LIB%
 @set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT
 @set CSF_LANGUAGE=us
 @set MMGT_CLEAR=1
@@ -78,10 +78,9 @@ cd /d %ROOT_DIR%
 @SET PYTHON_INCLUDE=%PYTHONHOME%\include
 @REM -------------------------
 
-
 @REM -------------------------
 @REM Some OCCT headers include FREETYPE headers
-@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.9.0
 @REM -------------------------
 
 @SET PATH=%GEOM_ROOT_DIR%\lib\salome;%PATH%
@@ -89,10 +88,10 @@ cd /d %ROOT_DIR%
 @SET _NO_DEBUG_HEAP=1
 
 IF "%ARCH%" == "Win64" (
-  call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x64
+  call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
 ) ELSE (
   IF "%ARCH%" == "Win32" (
-    call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+    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.

diff --git a/salomeRun_deb.bat b/salomeRun_deb.bat
index 75015844b2dcaa67bf0f2e862bec112959c9ffb0..6622e329570b8c04cdca3ca186ef04fbf58637b6 100644 (file)
--- a/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@ -1,5 +1,12 @@
 @ECHO OFF
 
+REM Find absolute path to ROOT_DIR
+@SET PARENT_DIR=%~dp0..
+@SET ROOT_DIR=
+pushd %PARENT_DIR%\..
+@SET ROOT_DIR=%CD%
+popd
+
 @SET OCC_LIB_PREFIX=d
 call env_Salome.bat d
 

diff --git a/salomeRun_rel.bat b/salomeRun_rel.bat
index 010cb93cbf1e72c7aa06256ac5ab2744aee39534..9d776d623888e9708006bebc2348621cdd1ba945 100644 (file)
--- a/salomeRun_rel.bat
+++ b/salomeRun_rel.bat
@@ -1,5 +1,12 @@
 @ECHO OFF
 
+REM Find absolute path to ROOT_DIR
+@SET PARENT_DIR=%~dp0..
+@SET ROOT_DIR=
+pushd %PARENT_DIR%\..
+@SET ROOT_DIR=%CD%
+popd
+
 call env_Salome.bat
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install