diff --git a/cmake-proxies/cmake-modules/Package.cmake b/cmake-proxies/cmake-modules/Package.cmake index b73e294e0..97e35602f 100644 --- a/cmake-proxies/cmake-modules/Package.cmake +++ b/cmake-proxies/cmake-modules/Package.cmake @@ -41,7 +41,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") elseif( CMAKE_SYSTEM_NAME STREQUAL "Darwin" ) set( CPACK_GENERATOR DragNDrop ) - set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/mac/Resources/Audacity-DMG-background.png") + set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/mac/Resources/Tenacity-DMG-background.tiff") set( CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/macOS/DMGSetup.scpt") if( ${_OPT}perform_codesign ) diff --git a/mac/Resources/Audacity-DMG-background.png b/mac/Resources/Audacity-DMG-background.png deleted file mode 100644 index d3abfc3d3..000000000 Binary files a/mac/Resources/Audacity-DMG-background.png and /dev/null differ diff --git a/mac/Resources/Tenacity-DMG-background.tiff b/mac/Resources/Tenacity-DMG-background.tiff new file mode 100644 index 000000000..a92cb86ce Binary files /dev/null and b/mac/Resources/Tenacity-DMG-background.tiff differ diff --git a/mac/scripts/build_dist.sh b/mac/scripts/build_dist.sh index 9954b79c2..81ada7729 100755 --- a/mac/scripts/build_dist.sh +++ b/mac/scripts/build_dist.sh @@ -178,7 +178,7 @@ then ${DSTROOT}/Tenacity.app # Create the ZIP archive for notarization - xcrun ditto -c -k --keepParent "${DSTROOT}/Tenacity.app" "${DSTROOT}.zip" + xcrun ditto -c -k --keepParent "${DSTROOT}/Tenacity.app" "${DSTROOT}.zip" # Send it off for notarization notarize "${DSTROOT}.zip" @@ -196,7 +196,7 @@ cp -pR "${DSTROOT}/" "${DMG}" # Copy over the background image mkdir "${DMG}/.background" -cp "${SRCROOT}/Resources/Audacity-DMG-background.png" "${DMG}/.background" +cp "${SRCROOT}/Resources/Tenacity-DMG-background.tiff" "${DMG}/.background" #Add a custom icon for the DMG #cp -p mac/Resources/Audacity.icns "${DMG}"/.VolumeIcon.icns @@ -243,13 +243,13 @@ echo ' set current view of container window to icon view set toolbar visible of container window to false set statusbar visible of container window to false - set the bounds of container window to {400, 100, 1000, 550} + set the bounds of container window to {400, 100, 1000, 558} set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 72 - set background picture of theViewOptions to file ".background:Audacity-DMG-background.png" + set background picture of theViewOptions to file ".background:Tenacity-DMG-background.tiff" make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} - set position of item "Audacity" of container window to {170, 350} + set position of item "Tenacity" of container window to {170, 350} set position of item "Applications" of container window to {430, 350} close open diff --git a/scripts/build/macOS/DMGSetup.scpt b/scripts/build/macOS/DMGSetup.scpt index 06c474f65..50d87de4b 100644 --- a/scripts/build/macOS/DMGSetup.scpt +++ b/scripts/build/macOS/DMGSetup.scpt @@ -7,11 +7,11 @@ on run argv set current view of container window to icon view set toolbar visible of container window to false set statusbar visible of container window to false - set the bounds of container window to {400, 100, 1000, 550} + set the bounds of container window to {400, 100, 1000, 558} set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 72 - set background picture of theViewOptions to file ".background:background.png" + set background picture of theViewOptions to file ".background:background.tiff" set position of item "Tenacity" of container window to {170, 350} set position of item "Applications" of container window to {430, 350} close