Merge pull request #5301 from opengisch/m-kuhn-patch-1

Retry create dmg on failure
opengisch · Jun 4, 2024 · 38fe524 · 38fe524 · qfield-fairy · Jun 4, 2024
2 parents 4b40b49 + c6d8d6c
commit 38fe524
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/platform/macos/CPackMacDeployQt.cmake.in b/platform/macos/CPackMacDeployQt.cmake.in
@@ -3,5 +3,12 @@ execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" qfield.app -appstore-complia
                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin
                 COMMAND_ERROR_IS_FATAL ANY
                 )
+
 execute_process(COMMAND create-dmg --volname "QField Installer" --hide-extension qfield.app --volicon "${CMAKE_SOURCE_DIR}/platform/macos/installer.icns" --background "${CMAKE_SOURCE_DIR}/platform/macos/installer_background.png" --window-pos 200 120 --window-size 512 320 --icon-size 100 --icon "qfield.app" 130 160 --app-drop-link 400 155 --codesign "${MACOS_CODE_SIGN_IDENTITY}" ${CMAKE_BINARY_DIR}/QField-Installer.dmg  ${CMAKE_BINARY_DIR}/output/bin/qfield.app
+                RESULT_VARIABLE CREATE_DMG_FAILURE)
+
+if(CREATE_DMG_FAILURE)
+  message(STATUS "Creating dmg failed. Retrying ...")
+  execute_process(COMMAND create-dmg --volname "QField Installer" --hide-extension qfield.app --volicon "${CMAKE_SOURCE_DIR}/platform/macos/installer.icns" --background "${CMAKE_SOURCE_DIR}/platform/macos/installer_background.png" --window-pos 200 120 --window-size 512 320 --icon-size 100 --icon "qfield.app" 130 160 --app-drop-link 400 155 --codesign "${MACOS_CODE_SIGN_IDENTITY}" ${CMAKE_BINARY_DIR}/QField-Installer.dmg  ${CMAKE_BINARY_DIR}/output/bin/qfield.app
                 COMMAND_ERROR_IS_FATAL ANY)
+endif()