From cb643171c14335317ed5490f3c2c77398253babd Mon Sep 17 00:00:00 2001
From: Popescu V <136721202+popescu-v@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:58:25 +0100
Subject: [PATCH 1/4] Update Khiops version to 10.2.3-rc.2

---
 src/Learning/KWUtils/KWKhiopsVersion.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Learning/KWUtils/KWKhiopsVersion.h b/src/Learning/KWUtils/KWKhiopsVersion.h
index bc3a7735b..8e67e666d 100644
--- a/src/Learning/KWUtils/KWKhiopsVersion.h
+++ b/src/Learning/KWUtils/KWKhiopsVersion.h
@@ -10,7 +10,7 @@
 // dans le TaskManager de Windows (par exemple)
 
 // Version de Khiops
-#define KHIOPS_VERSION KHIOPS_STR(10.2.3-rc.1)
+#define KHIOPS_VERSION KHIOPS_STR(10.2.3-rc.2)
 // Les versions release distribuees sont bases sur trois numeros, par exemple KHIOPS_STR(10.2.0)
 // Les versions alpha, beta ou release candidate ont un suffixe supplementaire, par exemple :
 // - KHIOPS_STR(10.5.0-a.1)

From 2833019e65aef2fb17ac80d7e90f0263321f226a Mon Sep 17 00:00:00 2001
From: Popescu V <136721202+popescu-v@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:04:34 +0100
Subject: [PATCH 2/4] Update documentation for Khiops executables' paths
 variables in `khiops_env`

Also fix `KHIOPS_DRIVERS_PATH` environment variable display on Windows
---
 packaging/common/khiops/WHATSNEW.txt            | 1 +
 packaging/linux/common/khiops_env/khiops_env.in | 4 ++--
 packaging/windows/khiops_env.cmd                | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packaging/common/khiops/WHATSNEW.txt b/packaging/common/khiops/WHATSNEW.txt
index 9de406f7d..e68cfd92b 100644
--- a/packaging/common/khiops/WHATSNEW.txt
+++ b/packaging/common/khiops/WHATSNEW.txt
@@ -15,6 +15,7 @@ Internal improvements linked to packaging, in particular with the systematic use
 
 Other minor improvements and bug fixes.
 
+
 Version 10.2.2
 ==============
 On Windows, the Khiops installation program now comes with the open-source Java JRE JustJ instead of Oracle's JDK.
diff --git a/packaging/linux/common/khiops_env/khiops_env.in b/packaging/linux/common/khiops_env/khiops_env.in
index 1bf7817f3..cb5629c21 100644
--- a/packaging/linux/common/khiops_env/khiops_env.in
+++ b/packaging/linux/common/khiops_env/khiops_env.in
@@ -9,8 +9,8 @@ help() {
     echo
     echo "The following variables are used to set the path and classpath for the prerequisite of Khiops."
     echo
-    echo "KHIOPS_PATH: path of Khiops executable, to add in path"
-    echo "KHIOPS_COCLUSTERING_PATH: path of Khiops coclustering executable, to add in path"
+    echo "KHIOPS_PATH: full path of Khiops executable"
+    echo "KHIOPS_COCLUSTERING_PATH: full path of Khiops coclustering executable"
     echo "KHIOPS_MPI_COMMAND: MPI command to call the Khiops tool"
     echo "KHIOPS_JAVA_PATH: path of Java tool, to add in path"
     echo "KHIOPS_CLASSPATH: Khiops java libraries, to add in classpath"
diff --git a/packaging/windows/khiops_env.cmd b/packaging/windows/khiops_env.cmd
index 619f196eb..010bbc598 100644
--- a/packaging/windows/khiops_env.cmd
+++ b/packaging/windows/khiops_env.cmd
@@ -13,8 +13,8 @@ echo    -env show the environment list and exit
 echo.
 echo The following variables are used to set the path and classpath for the prerequisite of Khiops.
 echo.
-echo KHIOPS_PATH: path of Khiops executable, to add in path
-echo KHIOPS_COCLUSTERING_PATH: path of Khiops coclustering executable, to add in path
+echo KHIOPS_PATH: full path of Khiops executable
+echo KHIOPS_COCLUSTERING_PATH: full path of Khiops coclustering executable
 echo KHIOPS_MPI_COMMAND: MPI command to call the Khiops tool
 echo KHIOPS_JAVA_PATH: path of Java tool, to add in path
 echo KHIOPS_CLASSPATH: Khiops java libraries, to add in classpath
@@ -125,7 +125,7 @@ echo KHIOPS_PROC_NUMBER %KHIOPS_PROC_NUMBER%
 echo KHIOPS_TMP_DIR %KHIOPS_TMP_DIR%
 echo KHIOPS_MEMORY_LIMIT %KHIOPS_MEMORY_LIMIT%
 echo KHIOPS_RAW_GUI %KHIOPS_RAW_GUI%
-echo KHIOPS_DRIVERS_PATH%KHIOPS_DRIVERS_PATH%
+echo KHIOPS_DRIVERS_PATH %KHIOPS_DRIVERS_PATH%
 echo KHIOPS_JAVA_ERROR %KHIOPS_JAVA_ERROR%
 echo KHIOPS_MPI_ERROR %KHIOPS_MPI_ERROR%
 endlocal

From 73c2721ec54c67c84f0f5250889a8b545758870f Mon Sep 17 00:00:00 2001
From: Popescu V <136721202+popescu-v@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:36:33 +0100
Subject: [PATCH 3/4] Fix CMake install script @SET_DRIVERS_PATH@ substitution
 on Conda / Windows

related_to #431
---
 packaging/install.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/install.cmake b/packaging/install.cmake
index e2d570697..958cf4092 100644
--- a/packaging/install.cmake
+++ b/packaging/install.cmake
@@ -174,7 +174,7 @@ else(UNIX)
     set(GUI_STATUS "false")
     set(SET_MPI "SET_MPI_CONDA")
     set(IS_CONDA_VAR "REM Inside conda environment\r\nset \"_IS_CONDA=true\"")
-    set(SET_KHIOPS_DRIVERS_PATH"REM Drivers search path\r\nset \"KHIOPS_DRIVERS_PATH=%_KHIOPS_HOME%\\lib\"")
+    set(SET_KHIOPS_DRIVERS_PATH "REM Drivers search path\r\nset \"KHIOPS_DRIVERS_PATH=%_KHIOPS_HOME%\\lib\"")
   else()
     set(SET_MPI "SET_MPI_SYSTEM_WIDE")
     set(GUI_STATUS "true")

From bf701bda5d6404efcf3e75abaf29e961423ce307 Mon Sep 17 00:00:00 2001
From: Popescu V <136721202+popescu-v@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:33:07 +0100
Subject: [PATCH 4/4] Use the instantiated `khiops_env` template in the Windows
 NSIS script

Thus, the instantiated `khiops_env` template is packaged into the native
Windows installer.

In order to make the tracing of the `khiops_env` script from template to
instantiation, add `.in` extension to the Windows `khiops_env` script template.

closes #431
---
 packaging/install.cmake                                 | 2 +-
 packaging/windows/{khiops_env.cmd => khiops_env.cmd.in} | 0
 packaging/windows/nsis/khiops.nsi                       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename packaging/windows/{khiops_env.cmd => khiops_env.cmd.in} (100%)

diff --git a/packaging/install.cmake b/packaging/install.cmake
index 958cf4092..42ee29ebe 100644
--- a/packaging/install.cmake
+++ b/packaging/install.cmake
@@ -180,7 +180,7 @@ else(UNIX)
     set(GUI_STATUS "true")
   endif()
 
-  configure_file(${PROJECT_SOURCE_DIR}/packaging/windows/khiops_env.cmd ${TMP_DIR}/khiops_env.cmd @ONLY
+  configure_file(${PROJECT_SOURCE_DIR}/packaging/windows/khiops_env.cmd.in ${TMP_DIR}/khiops_env.cmd @ONLY
                  NEWLINE_STYLE CRLF)
 
 endif(UNIX)
diff --git a/packaging/windows/khiops_env.cmd b/packaging/windows/khiops_env.cmd.in
similarity index 100%
rename from packaging/windows/khiops_env.cmd
rename to packaging/windows/khiops_env.cmd.in
diff --git a/packaging/windows/nsis/khiops.nsi b/packaging/windows/nsis/khiops.nsi
index fa184a22e..28c579d62 100644
--- a/packaging/windows/nsis/khiops.nsi
+++ b/packaging/windows/nsis/khiops.nsi
@@ -166,7 +166,7 @@ Section "Install" SecInstall
   File "${KHIOPS_WINDOWS_BUILD_DIR}\bin\_khiopsgetprocnumber.exe"
   File "${KHIOPS_WINDOWS_BUILD_DIR}\jars\norm.jar"
   File "${KHIOPS_WINDOWS_BUILD_DIR}\jars\khiops.jar"
-  File "..\khiops_env.cmd"
+  File "${KHIOPS_WINDOWS_BUILD_DIR}\tmp\khiops_env.cmd"
   File "..\khiops.cmd"
   File "..\khiops_coclustering.cmd"