SWPROT-8953: build: cmake: Adapt packaging rules since split

Something to deduplicate or align to standards

Signed-off-by: Philippe Coval <philippe.coval@silabs.com>

Author: rzr

applications/zpc/CMakeLists.txt

@@ -28,7 +28,7 @@ include(${COMMON_PATH}/cmake/include/compiler_options.cmake)
 include(${COMMON_PATH}/cmake/include/version.cmake)
 # include(${COMMON_PATH}/cmake/include/doxygen.cmake)
 include(${COMMON_PATH}/cmake/modules/CMakeCargo.cmake)
-# include(${COMMON_PATH}/cmake/include/package-helper.cmake)
+include(../../cmake/include/package-helper.cmake)
 include(${COMMON_PATH}/cmake/include/zap.cmake)
 include(${COMMON_PATH}/cmake/include/unittest.cmake)
 include(${COMMON_PATH}/cmake/include/version_file.cmake)

cmake/include/package-helper.cmake

@@ -1,5 +1,5 @@
-if(NOT PACKAGE_HELPER_CMAKE)
-  set(PACKAGE_HELPER_CMAKE ${CMAKE_CURRENT_LIST_DIR})
+if(NOT ZPC_PACKAGE_HELPER_CMAKE)
+  set(ZPC_PACKAGE_HELPER_CMAKE ${CMAKE_CURRENT_LIST_DIR})
 else()
   return()
 endif()
@@ -9,8 +9,13 @@ set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
 set(CPACK_DEB_PACKAGE_COMPONENT ON)
 
+# TODO: Not aligned to debian arch
+if(NOT DEFINED FILE_NAME_VERSIONING_ARCH)
+  set(FILE_NAME_VERSIONING_ARCH "${CMAKE_PROJECT_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
 set(CPACK_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}_${FILE_NAME_VERSIONING_ARCH}"
+  "${CMAKE_PROJECT_NAME}_${FILE_NAME_VERSIONING_ARCH}"
 )
 
 # Common CPACK configuration
@@ -108,22 +113,8 @@ macro(add_component_to_uic PKG_NAME PKG_DESCRIPTION PKG_FILE_NAME PKG_DEPNDS PKG
     set(CPACK_COMPONENTS_ALL                                ${CPACK_COMPONENTS_ALL}                     CACHE STRING "Packages that will have Debian packages built: ${CPACK_COMPONENTS_ALL}" FORCE)
 
     install(
-      FILES "${PACKAGE_HELPER_CMAKE}/../../copyright"
+      FILES "${CMAKE_SOURCE_DIR}/copyright"
       DESTINATION share/doc/${PKG_NAME}
       COMPONENT ${PKG_NAME})
   endif()
 endmacro()
-
-set(DEB_PACKAGE_FOLDER "unify_${FILE_NAME_VERSIONING_ARCH}")
-set(DEB_PACKAGE_ZIP "${DEB_PACKAGE_FOLDER}.zip")
-add_custom_target(
-  deb
-  DEPENDS package
-  COMMAND mkdir -p "${DEB_PACKAGE_FOLDER}"
-  COMMAND mv "\*_${FILE_NAME_VERSIONING_ARCH}.deb" "${DEB_PACKAGE_FOLDER}/"
-  COMMAND cd "${DEB_PACKAGE_FOLDER}" && dpkg-scanpackages . /dev/null
-          > Packages && cd ..
-  COMMAND zip -rm "${DEB_PACKAGE_ZIP}" "${DEB_PACKAGE_FOLDER}"
-  COMMAND mkdir -p deb-packages && mv "${DEB_PACKAGE_ZIP}" deb-packages
-  COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan
-          "Debian packages archived in deb-packages/${DEB_PACKAGE_FOLDER}.zip")

cmake/include/package.cmake

@@ -1,6 +1,37 @@
 message(STATUS "Components of Unify which will have deb packages"
                ": ${CPACK_COMPONENTS_ALL}")
 
+# TODO: Not aligned to debian arch
+if(NOT DEFINED FILE_NAME_VERSIONING_ARCH)
+  set(FILE_NAME_VERSIONING_ARCH "${CMAKE_PROJECT_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
+# Generate Debian package
+set(CPACK_GENERATOR "DEB")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Silicon Labs")
+set(CPACK_COMPONENTS_GROUPING "IGNORE")
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
+set(CPACK_DEB_PACKAGE_COMPONENT ON)
+set(CPACK_SOURCE_GENERATOR "TGZ")
+set(DEB_PACKAGE_FOLDER "${CMAKE_PROJECT_NAME}_${FILE_NAME_VERSIONING_ARCH}")
+set(DEB_PACKAGE_ZIP "${DEB_PACKAGE_FOLDER}.zip")
+set(DIST_FOLDER "dist")
+
+add_custom_target(
+  package_archive
+  DEPENDS package
+  COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${DEB_PACKAGE_FOLDER}"
+  COMMAND mv "${CMAKE_BINARY_DIR}/\*.deb" "${CMAKE_BINARY_DIR}/${DEB_PACKAGE_FOLDER}/"
+  COMMAND cd "${CMAKE_BINARY_DIR}/${DEB_PACKAGE_FOLDER}"
+    && dpkg-scanpackages . /dev/null > Packages
+    && cd ..
+  COMMAND zip --recurse-paths "${DEB_PACKAGE_ZIP}" "${DEB_PACKAGE_FOLDER}"
+  COMMAND mkdir -p "${DIST_FOLDER}" && mv "${DEB_PACKAGE_ZIP}" "${DIST_FOLDER}"
+  COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan
+  "${CPACK_GENERATOR} packages archived in ${DIST_FOLDER}/${DEB_PACKAGE_FOLDER}.zip"
+)
+
 if(PROJECT_IS_TOP_LEVEL)
   message(STATUS "cpack: Included from ${CMAKE_SOURCE_DIR}")
   include(CPack)