rename package filename and use default Debian convention

ros-industrial · Jan 17, 2025 · 5757093 · 5757093
1 parent 7319db0
commit 5757093
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,7 +63,7 @@ jobs:
           name: plugin_archive_artifact_${{ matrix.config.name }}
           if-no-files-found: error
           path: |
-            ./build/ROSProjectManager-*-*-*.zip
+            ./build/qtcreator-plugin-ros-*-*-*.zip
 
       - name: install Qt Creator DEB package
         if: runner.os == 'Linux'
@@ -85,8 +85,8 @@ jobs:
           if-no-files-found: error
           path: |
             ./build/qtcreator-opensource-linux-*-*.deb
-            ./build/ROSProjectManager-*-*-*.deb
-            ./build/ROSProjectManager-*-*-*-dbgsym.ddeb
+            ./build/qtcreator-plugin-ros_*_*.deb
+            ./build/qtcreator-plugin-ros-dbgsym_*_*.ddeb
 
   release:
     name: create release
@@ -104,5 +104,5 @@ jobs:
       - name: create release
         uses: ncipollo/release-action@v1
         with:
-          artifacts: qtcreator-opensource-linux-*-*.deb,ROSProjectManager-*-*-*.zip,ROSProjectManager-*-*-*.deb,ROSProjectManager-*-*-*-dbgsym.ddeb
+          artifacts: qtcreator-opensource-linux-*-*.deb,qtcreator-plugin-ros-*-*-*.zip,qtcreator-plugin-ros_*_*.deb,qtcreator-plugin-ros-dbgsym_*_*.ddeb
           artifactErrorsFailBuild: true
diff --git a/packaging/cpack-config.cmake b/packaging/cpack-config.cmake
@@ -5,6 +5,7 @@ if(CPACK_GENERATOR MATCHES "ZIP")
     set(CPACK_PACKAGING_INSTALL_PREFIX "")
 elseif(CPACK_GENERATOR MATCHES "DEB")
     # generate Debian package
+    set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
     set(CPACK_STRIP_FILES NO)
     set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/qt-creator/")
     set(CPACK_INSTALL_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/launcher.cmake)

diff --git a/packaging/cpack.cmake b/packaging/cpack.cmake
@@ -1,7 +1,7 @@
 # package metadata
 set(CPACK_PACKAGE_NAME "qtcreator-plugin-ros")
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
-set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt Creator plugin for ROS workspaces")
 set(CPACK_PACKAGE_DESCRIPTION
 "The ROS Qt Creator Plug-in is developed specifically for ROS to increase a