Misc cleanup

tresf · Jun 2, 2024 · fcb8e1e · fcb8e1e
1 parent ddca4e7
commit fcb8e1e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/cmake/apple/DS_Store b/cmake/apple/DS_Store
diff --git a/cmake/apple/MacDeployQt.cmake b/cmake/apple/MacDeployQt.cmake
@@ -23,6 +23,13 @@ if(CPACK_DEBUG)
 	set(COMMAND_ECHO STDOUT)
 endif()
 
+# Cleanup CPack "External" json, txt files, old DMG files
+file(GLOB cleanup "${CPACK_BINARY_DIR}/${lmms}-*.json"
+	"${CPACK_BINARY_DIR}/${lmms}-*.dmg"
+	"${CPACK_BINARY_DIR}/install_manifest.txt")
+list(SORT cleanup)
+file(REMOVE ${cleanup})
+
 # Create bundle structure
 file(MAKE_DIRECTORY "${APP}/Contents/MacOS")
 file(MAKE_DIRECTORY "${APP}/Contents/Frameworks")
@@ -133,7 +140,6 @@ string(SUBSTRING "${CPACK_PROJECT_NAME_UCASE} ${CPACK_PROJECT_VERSION}" 0 27 APP
 # We'll configure this file twice (again in MacDeployQt.cmake once we know CPACK_TEMPORARY_INSTALL_DIRECTORY)
 configure_file("${CPACK_CURRENT_SOURCE_DIR}/appdmg.json.in" "${CPACK_CURRENT_BINARY_DIR}/appdmg.json" @ONLY)
 
-file(REMOVE "${CPACK_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.dmg")
 execute_process(COMMAND "${APPDMG_BIN}"
 	"${CPACK_CURRENT_BINARY_DIR}/appdmg.json"
 	"${CPACK_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.dmg"

diff --git a/cmake/linux/LinuxDeploy.cmake b/cmake/linux/LinuxDeploy.cmake
@@ -25,10 +25,9 @@ endif()
 include(DownloadBinary)
 include(CreateSymlink)
 
-# Cleanup CPack "External" json files, old AppImage files
-file(GLOB cleanup "${CPACK_BINARY_DIR}/lmms-*.json"
-	"${CPACK_BINARY_DIR}/${LMMS}-*.AppImage"
-	"${CPACK_BINARY_DIR}/${CPACK_PROJECT_NAME_UCASE}-*.AppImage"
+# Cleanup CPack "External" json, txt files, old AppImage files
+file(GLOB cleanup "${CPACK_BINARY_DIR}/${lmms}-*.json"
+	"${CPACK_BINARY_DIR}/${lmms}-*.AppImage"
 	"${CPACK_BINARY_DIR}/install_manifest.txt")
 list(SORT cleanup)
 file(REMOVE ${cleanup})