HPCC-18913 Added CUSTOM_PACKAGE_SUFFIX to package name

Signed-off-by: Michael Gardner <michael.gardner@lexisnexisrisk.com>

CMakeLists.txt

@@ -239,6 +239,10 @@ if(TOP_LEVEL_PROJECT)
         set(CPACK_PACKAGE_NAME "hpccsystems-clienttools-${majorver}.${minorver}")
         set(PACKAGE_FILE_NAME_PREFIX  "hpccsystems-clienttools-${projname}")
     endif()
+    if(NOT "${CUSTOM_PACKAGE_SUFFIX}" STREQUAL "")
+	set(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-${CUSTOM_PACKAGE_SUFFIX}")
+	set(PACKAGE_FILE_NAME_PREFIX "${PACKAGE_FILE_NAME_PREFIX}-${CUSTOM_PACKAGE_SUFFIX}")
+    endif()
 
     set(CPACK_PACKAGE_VERSION_MAJOR ${majorver})
     set(CPACK_PACKAGE_VERSION_MINOR ${minorver})

cmake_modules/commonSetup.cmake

@@ -116,8 +116,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(LOGGING_SERVICE "Configure use of logging service" ON)
   option(WSSQL_SERVICE "Configure use of ws_sql service" ON)
   option(USE_DIGISIGN "Use digisign" ON)
-
-
+  set(CUSTOM_PACKAGE_SUFFIX "" CACHE STRING "Custom package suffix to differentiate development builds")
 
      MACRO(SET_PLUGIN_PACKAGE plugin)
         string(TOLOWER "${plugin}" pname)

initfiles/etc/DIR_NAME/CMakeLists.txt

@@ -20,6 +20,10 @@ if(NOT WSSQL_SERVICE)
     set(WSSQL_SERVICE_BLOCK_E "-->")
 endif(NOT WSSQL_SERVICE)
 
+if(NOT "${CUSTOM_PACKAGE_SUFFIX}" STREQUAL "")
+    set(version_file_prefix "${CUSTOM_PACKAGE_SUFFIX}_")
+endif()
+
 configure_file("version.in" "version")
 configure_file("environment.conf.in" "environment.conf" IMMEDIATE)
 configure_file("environment.xml.in" "environment.xml" IMMEDIATE)

initfiles/etc/DIR_NAME/version.in

@@ -1 +1 @@
-${projname}_${version}-${stagever}
+${version_file_prefix}${projname}_${version}-${stagever}