OCCT 7.8.0: windows build: stlgeom.hpp needs to be copied to install from sources

diff --git a/products/compil_scripts/CAS_7.8.bat b/products/compil_scripts/CAS_7.8.bat
index 5fff230dae2353cdd4a438a5a1f5743e0d00b084..e2bc014088b9afe3a0fdf7ce3df30ce32bd76d03 100644 (file)
--- a/products/compil_scripts/CAS_7.8.bat
+++ b/products/compil_scripts/CAS_7.8.bat
@@ -89,9 +89,9 @@ echo *********************************************************************
 echo *** installation (data)...
 echo *********************************************************************
 echo.
-robocopy %SOURCE_DIR%\data %PRODUCT_INSTALL%\data /E /NP /NFL /NDL /NS /NC
-if NOT %ERRORLEVEL% == 1 (
-    echo ERROR when copying %SOURCE_DIR%\data
+xcopy /Q /R /Y /E /H /I %SOURCE_DIR%\data %PRODUCT_INSTALL%\data
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR when copying %SOURCE_DIR%\data to %PRODUCT_INSTALL%\data
     exit 1
 )
 

diff --git a/products/compil_scripts/netgen_5_3_1.bat b/products/compil_scripts/netgen_5_3_1.bat
index e0a1011e1f5ddc8744b62f86bd805e390565a024..4c416e16707e36973efba60976e57a395fb44f1d 100755 (executable)
--- a/products/compil_scripts/netgen_5_3_1.bat
+++ b/products/compil_scripts/netgen_5_3_1.bat
@@ -70,86 +70,93 @@ echo --------------------------------------------------------------------------
 echo *** Installation into %PRODUCT_INSTALL%\r
 echo --------------------------------------------------------------------------\r
 \r
-robocopy nglib\%PRODUCT_BUILD_TYPE% %PRODUCT_INSTALL%\bin "*.exe" /E /NP /NFL /NDL /NS /NC\r
-if NOT %ERRORLEVEL% == 1 (\r
+copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.exe %PRODUCT_INSTALL%\bin\\r
+if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install executables\r
     exit 3\r
 )\r
 \r
-robocopy nglib\%PRODUCT_BUILD_TYPE% %PRODUCT_INSTALL%\lib "*.lib" "*.dll" /E /NP /NFL /NDL /NS /NC\r
-if NOT %ERRORLEVEL% == 1 (\r
-    echo ERROR on install libraries\r
+copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\lib\\r
+if NOT %ERRORLEVEL% == 0 (\r
+    echo ERROR on install static libraries \r
+    exit 4\r
+)\r
+\r
+copy /B /Y nglib\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\lib\\r
+if NOT %ERRORLEVEL% == 0 (\r
+    echo ERROR on install dynamic libraries\r
     exit 4\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\meshing\*.h* %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\meshing\*.h* %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install meshing includes\r
     exit 5\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\gprim\*.h* %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\gprim\*.h* %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install gprim includes\r
     exit 6\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\general\*.h* %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\general\*.h* %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install general includes\r
     exit 7\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\linalg\*.h* %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\linalg\*.h* %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install linalg includes\r
     exit 8\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\occ\*.h* %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\occ\*.h* %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install occ includes\r
     exit 9\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\mydefs.hpp %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\mydefs.hpp %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install mydefs.hpp\r
     exit 10\r
 )\r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\mystdlib.h %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\mystdlib.h %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install mystdlib.h\r
     exit 11\r
 )\r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\nginterface.h %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\nginterface.h %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install nginterface.h\r
     exit 12\r
 )\r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\nginterface_V2.hpp %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\include\nginterface_V2.hpp %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install nginterface_V2.hpp\r
     exit 13\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\nglib\nglib.h %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\nglib\nglib.h %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install nglib.h\r
     exit 14\r
 )\r
 \r
-xcopy /q /r /Y %SOURCE_DIR%\libsrc\include\stlgeom.hpp %PRODUCT_INSTALL%\include\r
+xcopy /Q /R /Y %SOURCE_DIR%\libsrc\stlgeom\stlgeom.hpp %PRODUCT_INSTALL%\include\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install stlgeom\r
     exit 15\r
 )\r
 \r
-robocopy %SOURCE_DIR%\cmake %PRODUCT_INSTALL%\cmake "*.cmake" /E /NP /NFL /NDL /NS /NC\r
-if NOT %ERRORLEVEL% == 1 (\r
+xcopy /Q /R /Y %SOURCE_DIR%\cmake\*.cmake %PRODUCT_INSTALL%\cmake\r
+if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR on install cmake files\r
     exit 16\r
 )\r
+\r
 taskkill /F /IM "mspdbsrv.exe"\r
 \r
 \r

diff --git a/products/netgen.pyconf b/products/netgen.pyconf
index a45a43da212a67f4257e7527ba4c92b43654bcc3..987591e5c62176cc78bbc1a2ca38b1320581623e 100644 (file)
--- a/products/netgen.pyconf
+++ b/products/netgen.pyconf
@@ -62,11 +62,12 @@ version_5_3_1_with_CAS_7_8 :
 version_5_3_1_with_CAS_7_8_win :
 {
    archive_info : {archive_name : "netgen-5.3.1.tar.gz"}
+   compil_script : 'netgen_5_3_1.bat'
    patches :  ['netgen53ForSalomeOCCT730.patch','netgen53ForWindowsOCC780.patch','netgen53ForSalomeVisualStudio2017.patch','netgen5.3_withOCCT780_win.patch']
    properties :
    {
      incremental : "yes"
-     single_install_dir : "no"
+     single_install_dir : "yes"
    }
 }