From dbc413e8535af794b61015bf8ac60b2f721607ce Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 4 Nov 2024 16:31:51 +0100
Subject: [PATCH] spns #43020: install executables in %SINGLE_INSTALL_DIR% and
 save PATH length

---
 products/compil_scripts/cgal-v5.6.1.bat   | 23 ++++++++++++-----------
 products/compil_scripts/cork.bat          | 19 +++++++++++++++++++
 products/compil_scripts/libigl-v2.5.0.bat | 12 +++++++++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/products/compil_scripts/cgal-v5.6.1.bat b/products/compil_scripts/cgal-v5.6.1.bat
index 31531b7..ac56536 100644
--- a/products/compil_scripts/cgal-v5.6.1.bat
+++ b/products/compil_scripts/cgal-v5.6.1.bat
@@ -88,12 +88,12 @@ mkdir %BUILD_DIR%\cgal_test
 cd %BUILD_DIR%\cgal_test
 
 set CMAKE_OPTIONS=
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%BUILD_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_DIR=%PRODUCT_INSTALL:\=/%/lib/cmake
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEXECUTABLE_OUTPUT_PATH=%PRODUCT_INSTALL:\=/%/bin
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEXECUTABLE_OUTPUT_PATH=%BUILD_DIR:\=/%/bin
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_DISABLE_GMP=OFF
 
 echo.
@@ -120,17 +120,18 @@ if NOT %ERRORLEVEL% == 0 (
     exit 2
 )
 
-echo.
-echo *********************************************************************
-echo *** installation...
-echo *********************************************************************
-echo.
-
-msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj
+REM Install the executable into the common directory
+if NOT exist "%SINGLE_INSTALL_DIR%" mkdir %SINGLE_INSTALL_DIR%
+if NOT exist "%SINGLE_INSTALL_DIR%\bin" mkdir %SINGLE_INSTALL_DIR%\bin
+copy /B /Y %BUILD_DIR%\bin\%PRODUCT_BUILD_TYPE%\exec_cgal.exe %SINGLE_INSTALL_DIR%\bin\exec_cgal.exe
 if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on msbuild INSTALL.vcxproj
-    exit 3
+    echo ERROR could not copy exec_cgal.exe to %SINGLE_INSTALL_DIR%\bin
+    exit 2
 )
 
+echo.
+echo exec_cgal version: %VERSION%> %PRODUCT_INSTALL%\README.txt
+echo Installation folder: %SINGLE_INSTALL_DIR%\bin >> %PRODUCT_INSTALL%\README.txt
+
 echo
 echo ########## END
diff --git a/products/compil_scripts/cork.bat b/products/compil_scripts/cork.bat
index 50c5625..386bc74 100644
--- a/products/compil_scripts/cork.bat
+++ b/products/compil_scripts/cork.bat
@@ -49,3 +49,22 @@ if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild  wincork.vcxproj
     exit 2
 )
+
+REM Install the executable into the common directory
+if NOT exist "%SINGLE_INSTALL_DIR%" mkdir %SINGLE_INSTALL_DIR%
+if NOT exist "%SINGLE_INSTALL_DIR%\bin" mkdir %SINGLE_INSTALL_DIR%\bin
+
+copy /Y /B %BUILD_DIR%\win\wincork\x64\%PRODUCT_BUILD_TYPE%\wincork.pdb %SINGLE_INSTALL_DIR%\bin\
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on wincork.pdb
+    exit 3
+)
+copy /Y /B %BUILD_DIR%\win\wincork\x64\%PRODUCT_BUILD_TYPE%\wincork.exe %SINGLE_INSTALL_DIR%\bin\
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on msbuild wincork.exe
+    exit 3
+)
+
+echo.
+echo libigl 609_Boolean version: %VERSION%> %PRODUCT_INSTALL%\README.txt
+echo Installation folder: %SINGLE_INSTALL_DIR%\bin >> %PRODUCT_INSTALL%\README.txt
diff --git a/products/compil_scripts/libigl-v2.5.0.bat b/products/compil_scripts/libigl-v2.5.0.bat
index 855b1b3..7f2ec1b 100644
--- a/products/compil_scripts/libigl-v2.5.0.bat
+++ b/products/compil_scripts/libigl-v2.5.0.bat
@@ -84,14 +84,20 @@ echo *** installation...
 echo *********************************************************************
 echo.
 
-mkdir %PRODUCT_INSTALL%\bin
+REM Install the executable into the common directory
+if NOT exist "%SINGLE_INSTALL_DIR%" mkdir %SINGLE_INSTALL_DIR%
+if NOT exist "%SINGLE_INSTALL_DIR%\bin" mkdir %SINGLE_INSTALL_DIR%\bin
 
-copy /Y /B %BUILD_DIR%\bin\%PRODUCT_BUILD_TYPE%\* %PRODUCT_INSTALL%\bin\
+copy /Y /B %BUILD_DIR%\bin\%PRODUCT_BUILD_TYPE%\* %SINGLE_INSTALL_DIR%\bin\
 if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on msbuild INSTALL.vcxproj
+    echo ERROR on msbuild 609_Boolean.vcxproj
     exit 3
 )
 
+echo.
+echo libigl 609_Boolean version: %VERSION%> %PRODUCT_INSTALL%\README.txt
+echo Installation folder: %SINGLE_INSTALL_DIR%\bin >> %PRODUCT_INSTALL%\README.txt
+
 set MSBUILDDISABLENODEREUSE=1
 
 echo
-- 
2.39.2