Merge pull request #433 from KhiopsML/431-on-windows-cmake-variable-s…

…et_khiops_drivers_path-is-not-substituted-correctly-in-khiops_envcmd 431 on windows cmake variable set khiops drivers path is not substituted correctly in khiops envcmd
KhiopsML · Nov 7, 2024 · f46c096 · f46c096
2 parents 7bebb2e + bf701bd
commit f46c096
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git 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/install.cmake b/packaging/install.cmake
@@ -174,13 +174,13 @@ 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")
   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/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 → packaging/windows/khiops_env.cmd.in b/packaging/windows/khiops_env.cmd → packaging/windows/khiops_env.cmd.in
@@ -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

diff --git 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"
 

diff --git 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)