From fcb8e1eb8df7d2ea129ebe023ee2e74bbd5ad565 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Sun, 2 Jun 2024 02:54:13 -0400
Subject: [PATCH] Misc cleanup

---
 cmake/apple/DS_Store          | Bin 15364 -> 0 bytes
 cmake/apple/MacDeployQt.cmake |   8 +++++++-
 cmake/linux/LinuxDeploy.cmake |   7 +++----
 3 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 cmake/apple/DS_Store

diff --git a/cmake/apple/DS_Store b/cmake/apple/DS_Store
deleted file mode 100644
index c1cb3ec6daa9bc50bdc617a4c0f5bc5d14427021..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15364
zcmeI1&u<$=6vy8<DXd9aZ|oM@rnD;=2~g6_I>n_?E8)5U8mW=1I!Y6olJ44Td)3X3
zwYyH*Mv;63S`b&RTzlru1&ITHKo3YrsDA+Bj6~o3aFRNJgmUTO&1&cS{Pw;1@sYiw
z83O>T_L?OC3jhqfg_`47{X-GY#eJY;wC4ya!~6pQ<RAh>fCvx)B0vOQIRdz5i(-r^
zrJ4v30V1$VK)fF;yoFY@_La(42Uc<mfI5n9S<sgI08~pjP%B#dO3{ObsZ>;z%Jde4
z>1_m4>G-^&<NHcgIxyKYwxfGydWXXFE`(V!99Tsu)kJ^@93-Ij?zXp;biI&!81Spt
z4TB_goM$XEGJ52-*NyBOW8+7U<;->S_%$A-ZV>r#y~DTaLDTo#_>Qn|x@l)%YyVvt
zle%dysp_aD*IN$!Et#>zd59TnI{J3dOgn40gQ&^3s=OC9ldO?748w$V^W^q+$#JGF
ztahfY?GK&uwDrO4?9PsH%DHlV*^9Qn`0}gAPrm-<TQxzZUlK4eG~uWCnSmWNHuY>r
zii6qyX6A<HJCQFOKk?>UCr_Q8JoEP1&po$sza5LAEj{e|>t=q>agB#OzU4QO(2(=f
z*!QD#voPeYhCOT{mms-?29IvW{w8u+lb=(6V<BqsmDGQb)`Lg>N`Mi<z%E5pt(yis
zN|yaNLA}$CgJ!+!HiD=v?OLmq`02_%d-ZPUdVW}osyt2k#;O~~Zq)Xx4__MY!iL-S
zuZDq}n3>{7e<*SXjjU0uyr&;l?kU4$#mcJoDFG-BjO<dxBfmDmJ`*0S@y$JXV{x%=
zmFx?)bKVWR9oH_|<+-`3_Qi7f_tp>n>r)`UnEBiuHaiVktwEdrLkpt4LHyrX0FLUl
zW8j4`d#@ky1rcjX9**G>lmic3Xuy4FLkt{x5J3}cNFjh0UOBh~lW+qT@v38d37=iS
z+kx|#7eW_0sJ8T%VGge;Z0RDD@yf%QnSCA4?2SRqwE*wTEc39p;U_cy!Ar~t7ti-`
zB#St<NALu`gYV%f{0P6mGk6Yv!e6YwPO!7=UFNV7n`M{TJo|*z*a~x*$J&ZRX7Hmq
zx64HunV(SbN3&UvqmV};T11Y+Rh(TH=NKR#R}$e!Cs_!2L%&LJEzVrR*q<eKG_V-E
zv~0}67G92r#~8CeUM5jR1c(3;AOb{y2oM1xKm>@uVF`?=1}t&@|M9>7|9{wSD4z%r
zfmfIS8=bGuS8;%Y6M*5dit`c+?|XQQBI5c=WeQgENCj0M$KwZa950WF(C45n3)&T7
zp!Subg@yhMkQk^U0z`la5CI}U1c(3;AOb{y2oM1xKm>>Y5g-CYfCvx)B5-H|F94rn
BA@u+N

diff --git a/cmake/apple/MacDeployQt.cmake b/cmake/apple/MacDeployQt.cmake
index 7e069b3a0c9..1402d4ecdc8 100644
--- 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
index dfd6e85712f..1418e6d3fdd 100644
--- 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})