restore default cpack file names

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
           cp ../resources/icon.png implay.png
           DEPLOY_GTK_VERSION=3 ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --output appimage \
             --desktop-file implay.desktop --icon-file implay.png
-          mv ImPlay-*.AppImage ImPlay-linux64.AppImage
+          mv ImPlay*.AppImage $(echo ImPlay-*.deb | sed 's/deb/AppImage/')
       - uses: actions/upload-artifact@v3
         with:
           name: ImPlay-linux
@@ -105,6 +105,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
+      - run: |
+          for f in ImPlay-*/*; do
+            mv "$f" "${f/ImPlay-*-/ImPlay-dev-}"
+          done
       - uses: rickstaa/action-create-tag@v1
         with:
           tag: continuous
@@ -113,7 +117,7 @@ jobs:
         with:
           commit: ${{ github.sha }}
           tag: continuous
-          artifacts: "ImPlay-*/*"
+          artifacts: "ImPlay-dev-*"
           allowUpdates: true
           prerelease: true
           name: Continuous build
@@ -122,24 +126,24 @@ jobs:
             # Install
             ## Windows
             - MSI
-              - Download `ImPlay-win64.msi`
-              - Run the MSI
+              - Download the msi executable
+              - Run the MSI installer
               - Run ImPlay from Start Menu
             - Zip
-              - Download `ImPlay-win64.zip`
+              - Download the windows zip
               - Extract the zip
               - Run `ImPlay.exe`
             ## macOS
-            - Download `ImPlay-macOS.dmg`
+            - Download the dmg file
             - Double click the dmg to show it's contents
-            - Drag the application to Applications
+            - Drag ImPlay to `Applications` folder
             - Run ImPlay from Launchpad
             ## Linux
             - Debian Package
-              - Download `ImPlay-linux64.deb`
-              - Install: `sudo apt install ./ImPlay-linux64.deb`
+              - Download the deb file
+              - Install: `sudo apt install ./ImPlay-*.deb`
               - Run `ImPlay`
             - AppImage
-              - Download `ImPlay-linux64.AppImage`
-              - Run `chmod u+x ImPlay-linux64.AppImage && ./ImPlay-linux64.AppImage`
+              - Download the AppImage file
+              - Run `chmod u+x ImPlay-*.AppImage && ./ImPlay-*.AppImage`
 

.github/workflows/release.yml

@@ -22,23 +22,23 @@ jobs:
             # Install
             ## Windows
             - MSI
-              - Download `ImPlay-win64.msi`
-              - Run the MSI
+              - Download the msi executable
+              - Run the MSI installer
               - Run ImPlay from Start Menu
             - Zip
-              - Download `ImPlay-win64.zip`
+              - Download the windows zip
               - Extract the zip
               - Run `ImPlay.exe`
             ## macOS
-            - Download `ImPlay-macOS.dmg`
+            - Download the dmg file
             - Double click the dmg to show it's contents
-            - Drag the application to Applications
+            - Drag ImPlay to `Applications` folder
             - Run ImPlay from Launchpad
             ## Linux
             - Debian Package
-              - Download `ImPlay-linux64.deb`
-              - Install: `sudo apt install ./ImPlay-linux64.deb`
+              - Download the deb file
+              - Install: `sudo apt install ./ImPlay-*.deb`
               - Run `ImPlay`
             - AppImage
-              - Download `ImPlay-linux64.AppImage`
-              - Run `chmod u+x ImPlay-linux64.AppImage && ./ImPlay-linux64.AppImage`
+              - Download the AppImage file
+              - Run `chmod u+x ImPlay-*.AppImage && ./ImPlay-*.AppImage`

CMakeLists.txt

@@ -189,7 +189,6 @@ if(WIN32)
   endforeach()]])
 
   set(CPACK_GENERATOR ZIP WIX)
-  set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-win64")
   set(CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR}/resources/win32/wix/patch.xml")
   set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/resources/win32/app.ico")
   set(CPACK_WIX_UPGRADE_GUID "D7438EFE-D62A-4E94-A024-6E71AE1A7A63")
@@ -231,12 +230,10 @@ elseif (APPLE)
 
   set(CPACK_GENERATOR DragNDrop)
   set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
-  set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-macOS")
   set(CPACK_BUNDLE_ICON ${PROJECT_SOURCE_DIR}/resources/macos/app.icns)
   set(CPACK_BUNDLE_PLIST ${CMAKE_BINARY_DIR}/ImHex.app/Contents/Info.plist)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(CPACK_GENERATOR TGZ DEB)
-  set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-linux64")
   set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}")
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "tsl0922")
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE)
@@ -247,12 +244,9 @@ endif()
 
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "tsl0922")
-set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Cross-Platform Desktop Media Player")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
-set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
+set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
 
 include(CPack)