fix package processv0.0.1

2 files changed, 21 insertions, 32 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86753c7..e321647 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
   BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
-  INSTALL_PREFIX: "/home/mesasoft/sapp_run/"
+  INSTALL_PREFIX: "/opt/tsg/shaping_engine"
   INSTALL_DEPENDENCY_LIBRARY: systemd-devel libMESA_handle_logger-devel  libcjson-devel tsg_master-devel sapp-devel framework_env libMESA_prof_load-devel librdkafka-devel libmaat4 libmaat4-devel libasan mrzcpd numactl-libs libibverbs libmlx5 libswarmkv-devel
 
 stages:
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index c83b5d8..3eb5d64 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,49 +1,38 @@
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(MY_RPM_NAME_PREFIX "shaping_engine-debug")
+    set(CPACK_PACKAGE_NAME "shaping_engine-debug")
 else()
-    set(MY_RPM_NAME_PREFIX "shaping_engine")
+    set(CPACK_PACKAGE_NAME "shaping_engine")
 endif()
 
-message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
+message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
 
-set(CPACK_PACKAGE_VECDOR "MESA")
+set(CPACK_PACKAGE_VENDOR "MESASOFT")
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${DESCRIBE}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
-
-execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
-SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
 set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
 set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
-set(CPACK_RPM_PACKAGE_VENDOR "MESA")
-set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
-set(CPACK_RPM_PACKAGE_RELEASE_DIST "on")
-set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
-
-set(CPACK_RPM_COMPONENT_INSTALL ON)
-set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
-set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
-set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
-
-set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
-set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
-set(CPACK_COMPONENT_PROFILE_GROUP "LIBRARIES")
-set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES")
-
-set(CPACK_COMPONENTS_ALL PROFILE LIBRARIES)
-
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
-set(CPACK_RPM_PACKAGE_AUTOREQ "no")
-
-set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
+set(CPACK_RPM_DEBUGINFO_PACKAGE on)
+set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
+set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
+set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
 
 # Must uninstall the debug package before install release package
-set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CPACK_RPM_PACKAGE_CONFLICTS "shaping_engine")
+else()
+    set(CPACK_RPM_PACKAGE_CONFLICTS "shaping_engine-debug")
+endif()
+
+# setup %config(noreplace)
+set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/main.conf"
+                            "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/zlog.conf"
+                            "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/table_info.json")
 
-#    set(CPACK_STRIP_FILES TRUE)
 include(CPack)