X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2FMeshGems.bat;h=5e86cf15c2ed26b283ac765313991cc9969967c9;hb=b07bdf74780ecf760363bb867f5062023e43422c;hp=5d76b6f4de40d332cd38ab2e0b97897f69f9888c;hpb=298f0f1f3babde4391646eecad9c63ec2f3f46c2;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/MeshGems.bat b/products/compil_scripts/MeshGems.bat
index 5d76b6f..5e86cf1 100755
--- a/products/compil_scripts/MeshGems.bat
+++ b/products/compil_scripts/MeshGems.bat
@@ -15,24 +15,29 @@ mkdir %BUILD_DIR%
 
 cd %SOURCE_DIR%
 
-set SRC_FOLDER=Win7_64_VC14
-
+set SRC_FOLDER_VC14=Win7_64_VC14
+set SRC_FOLDER_VC15=Win7_64_VC15
 cd DISTENE\MeshGems-*\Products
 
-echo SRC_FOLDER = %SRC_FOLDER%
 echo PRODUCT_INSTALL = %PRODUCT_INSTALL%
 
 rem ## Includes
-xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q
+xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q /Y
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on copying include
     exit 1
 )
 
 rem ## Lib
+set SRC_FOLDER=%SRC_FOLDER_VC15%
+if exist "lib\%SRC_FOLDER_VC14%" (
+   set SRC_FOLDER=%SRC_FOLDER_VC14%
+)
+
+echo SRC_FOLDER = %SRC_FOLDER%
 echo. 
-echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q
-xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q
+echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
+xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on copying lib
     exit 2
@@ -40,8 +45,8 @@ if NOT %ERRORLEVEL% == 0 (
 
 rem ## Bin
 echo. 
-echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
-xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
+echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y
+xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on copying bin
     exit 3