Manage package renaming for rpm and deb

packages khiops-core-openmpi with a version >> 10.2.1 replace khiops-core-10.2.1 without trouble with apt and dnf Update of the Khiops Version to 10.2.2-b0
KhiopsML · Apr 18, 2024 · e9aeecc · e9aeecc
1 parent f493a91
commit e9aeecc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packaging/install.cmake b/packaging/install.cmake
@@ -71,9 +71,9 @@ if(NOT IS_FEDORA_LIKE)
 
   # We install the binary with mpi suffix and create a symlink without the suffix
   get_target_property(MODL_NAME MODL OUTPUT_NAME)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/bin/${MODL_NAME} ${CMAKE_BINARY_DIR}/MODL)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/bin/${MODL_NAME} ${TMP_DIR}/MODL)
   install(
-    FILES ${CMAKE_BINARY_DIR}/MODL
+    FILES ${TMP_DIR}/MODL
     DESTINATION usr/bin
     COMPONENT KHIOPS_CORE)
 else()
@@ -90,9 +90,9 @@ else()
 
   # We install the binary under $MPI_BIN and create a symlink to it
   get_target_property(MODL_NAME MODL OUTPUT_NAME)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MPI_BIN}/khiops/${MODL_NAME} ${CMAKE_BINARY_DIR}/MODL)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MPI_BIN}/khiops/${MODL_NAME} ${TMP_DIR}/MODL)
   install(
-    FILES ${CMAKE_BINARY_DIR}/MODL
+    FILES ${TMP_DIR}/MODL
     DESTINATION usr/bin
     COMPONENT KHIOPS_CORE)
 

diff --git a/packaging/packaging.cmake b/packaging/packaging.cmake
@@ -70,7 +70,6 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 
 # user friendly archive names
 set(CPACK_ARCHIVE_KNI_FILE_NAME kni-${KHIOPS_VERSION})
-set(CPACK_ARCHIVE_KNI_DOC_FILE_NAME kni-doc-${KHIOPS_VERSION})
 set(CPACK_ARCHIVE_KHIOPS_FILE_NAME khiops-${KHIOPS_VERSION})
 set(CPACK_ARCHIVE_KHIOPS_CORE_FILE_NAME khiops-core-${KHIOPS_VERSION})
 
@@ -103,6 +102,9 @@ set(CPACK_DEBIAN_KHIOPS_CORE_PACKAGE_NAME khiops-core${PACKAGE_SUFFIX})
 set(CPACK_DEBIAN_KNI_PACKAGE_NAME kni)
 set(CPACK_DEBIAN_KNI_DOC_PACKAGE_NAME kni-doc)
 
+# manage package renaming
+set(CPACK_DEBIAN_KHIOPS_CORE_PACKAGE_REPLACES "khiops-core (<< 10.2.2~ )")
+
 # packages depends
 
 if("${MPI_IMPL}" STREQUAL "openmpi")
@@ -155,6 +157,9 @@ set(CPACK_RPM_KHIOPS_CORE_PACKAGE_SUMMARY "Khiops tools (core)")
 set(CPACK_RPM_KNI_PACKAGE_SUMMARY "Khiops Native Interface")
 set(CPACK_RPM_KNI_DOC_PACKAGE_SUMMARY "Khiops Native Interface documentation")
 
+# manage package renaming
+set(CPACK_RPM_KHIOPS_CORE_PACKAGE_OBSOLETES "khiops-core <= 10.2.1-2")
+
 # packages requires
 set(CPACK_RPM_KHIOPS_PACKAGE_REQUIRES "khiops-core${PACKAGE_SUFFIX} = ${KHIOPS_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
 set(CPACK_RPM_KHIOPS_PACKAGE_REQUIRES "java >= 1.8")

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.1)
+#define KHIOPS_VERSION KHIOPS_STR(10.2.2-b0)
 // 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-a1)