WIP for ticket 1047 Added error checking to generated scripts for MacOS packages

Removed a debug message

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6934 30fe4595-0a0c-4342-8851-515496e4dcbd

cmake/packagemaker.cmake

@@ -171,7 +171,7 @@ IF(APPLE)
     SET(READ_ONLY_DMG_NAME "${INTERNAL_NAME}-${VERSION}-base-r${SVN_REV}-${CPACK_SYSTEM_NAME}.dmg")
 
     string(REPLACE ".app" "-base.app" SD_BASE_BUNDLE_NAME "${CMAKE_INSTALL_PREFIX}")
-    message(STATUS "SD_BASE_BUNDLE_NAME = ${SD_BASE_BUNDLE_NAME}")
+
     # TODO make ${SD_BUNDLE_NAME} a CACHE variable and use it everywhere instead of ${CMAKE_INSTALL_PREFIX}??
     SET(SD_BUNDLE_NAME "${SD_BASE_BUNDLE_NAME}")
 

packaging/OSX/packagedmg.cmake.in

@@ -6,59 +6,107 @@
 #==============================================================================
 
 set(_result )
+set(_error )
+
+# Create a read/write dmg
 message(STATUS "Creating read/write dmg...")
 execute_process(COMMAND hdiutil create "./@READ_WRITE_DMG_NAME@" -volname "@DMG_VOL_NAME@" -size 4g -fs HFS+
                RESULT_VARIABLE _result
+               ERROR_VARIABLE _error
                COMMAND_ECHO STDOUT )
-message(STATUS "Result of hdiutil create = ${_result}")
+#message(STATUS "Result of hdiutil create = ${_result}")
 
-message(STATUS "Attaching read/write dmg...")
-execute_process(COMMAND hdiutil attach "./@READ_WRITE_DMG_NAME@" -nobrowse
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of hdiutil attach = ${_result}")
+# Attach read/write dmg
+if(${_result} EQUAL "0")
+   message(STATUS "Attaching read/write dmg...")
+   execute_process(COMMAND hdiutil attach "./@READ_WRITE_DMG_NAME@" -nobrowse
+                  RESULT_VARIABLE _result
+                  ERROR_VARIABLE _error
+                  COMMAND_ECHO STDOUT )
+   #message(STATUS "Result of hdiutil attach = ${_result}")
 
+   # Copy the background image (renaming NOTE the leading . in target name)
+   if(${_result} EQUAL "0")
+      # Copy the background image (renaming NOTE the leading . in target name)
+      message(STATUS "Copying installer-mac-bg-22.png...")
+      execute_process(COMMAND cp "@CMAKE_SOURCE_DIR@/packaging/OSX/installer-mac-bg-22.png" "/Volumes/@DMG_VOL_NAME@/.installer-mac-bg-22.png"
+                     RESULT_VARIABLE _result
+                     ERROR_VARIABLE _error
+                     COMMAND_ECHO STDOUT )
+      #message(STATUS "Result of copying installer-mac-bg-22.png = ${_result}")
 
-# Copy the background image (renaming NOTE the leading . in target name)
-message(STATUS "Copying installer-mac-bg-22.png...")
-execute_process(COMMAND cp "@CMAKE_SOURCE_DIR@/packaging/OSX/installer-mac-bg-22.png" "/Volumes/@DMG_VOL_NAME@/.installer-mac-bg-22.png"
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of copying installer-mac-bg-22.png = ${_result}")
+      # Create a link to Applications folder
+      if(${_result} EQUAL "0")
+         # Create a link to Applications folder
+         message(STATUS "Creating link to Applications...")
+         execute_process(COMMAND ln -s /Applications "/Volumes/@DMG_VOL_NAME@/Applications"
+                        RESULT_VARIABLE _result
+                        ERROR_VARIABLE _error
+                        COMMAND_ECHO STDOUT )
+         #message(STATUS "Result of creating link to Applications = ${_result}")
+      endif()
 
-# Create a link to Applications folder
-message(STATUS "Creating link to Applications...")
-execute_process(COMMAND ln -s /Applications "/Volumes/@DMG_VOL_NAME@/Applications"
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of creating link to Applications = ${_result}")
+      # Copy the whole .app folder recursively
+      if(${_result} EQUAL "0")
 
-# Copy the whole .app folder recursively
-message(STATUS "Copying the @SD_BUNDLE_NAME@ folder...")
-execute_process(COMMAND cp -r "@SD_BUNDLE_NAME@/" "/Volumes/@DMG_VOL_NAME@/@SD_BUNDLE_NAME@"
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of copying the @SD_BUNDLE_NAME@ folder = ${_result}")
+         # Copy the whole .app folder recursively
+         message(STATUS "Copying the @SD_BUNDLE_NAME@ folder...")
+         execute_process(COMMAND cp -r "@SD_BUNDLE_NAME@/" "/Volumes/@DMG_VOL_NAME@/@SD_BUNDLE_NAME@"
+                        RESULT_VARIABLE _result
+                        ERROR_VARIABLE _error
+                        COMMAND_ECHO STDOUT )
+         #message(STATUS "Result of copying the @SD_BUNDLE_NAME@ folder = ${_result}")
+      endif()
 
-# run the generated 'Finder' script
-message(STATUS "Running the generated 'Finder' script...")
-execute_process(COMMAND osascript @DMG_FINDER_SCRIPT@
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of running the generated 'Finder' script = ${_result}")
+      # run the generated 'Finder' script
+      if(${_result} EQUAL "0")
+         # run the generated 'Finder' script
+         message(STATUS "Running the generated 'Finder' script...")
+         execute_process(COMMAND osascript @DMG_FINDER_SCRIPT@
+                        RESULT_VARIABLE _result
+                        ERROR_VARIABLE _error
+                        COMMAND_ECHO STDOUT )
+         #message(STATUS "Result of running the generated 'Finder' script = ${_result}")
+      endif()
 
+      # Detach the read/write dmg
+      if(${_result} EQUAL "0")
+         message(STATUS "Detaching read/write dmg...")
+         execute_process(COMMAND hdiutil detach "/Volumes/@DMG_VOL_NAME@/"
+                        RESULT_VARIABLE _result
+                        ERROR_VARIABLE _error
+                        COMMAND_ECHO STDOUT )
+         #message(STATUS "Result of hdiutil detach = ${_result}")
+      # Detach the read/write dmg but use differt variables to preserve the real error
+      else()
+         message(WARNING "Error(s) occured: Detaching read/write dmg...")
+         execute_process(COMMAND hdiutil detach "/Volumes/@DMG_VOL_NAME@/"
+                        RESULT_VARIABLE _detach_result
+                        ERROR_VARIABLE _detach_error
+                        COMMAND_ECHO STDOUT )
+         if(NOT (${_detach_result} EQUAL "0") )
+            message(WARNING "Failed to detach after earlier error: ${_detach_error}")
+         endif()
+      endif()
 
-message(STATUS "Detaching read/write dmg...")
-execute_process(COMMAND hdiutil detach "/Volumes/@DMG_VOL_NAME@/"
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of hdiutil detach = ${_result}")
+      # create the Read only version
+      if(${_result} EQUAL "0")
+         # create the Read only version
+         message(STATUS "converting read/write dmg to read-only...")
+         execute_process(COMMAND hdiutil convert "./@READ_WRITE_DMG_NAME@" -format UDZO -imagekey zlib-level=9 -o "./@READ_ONLY_DMG_NAME@"
+                        RESULT_VARIABLE _result
+                        ERROR_VARIABLE _error
+                        COMMAND_ECHO STDOUT )
+         #message(STATUS "Result of hdiutil convert = ${_result}")
+      endif()
+   endif()
+endif()
 
-
-# create the Read only version
-message(STATUS "converting read/write dmg to read-only...")
-execute_process(COMMAND hdiutil convert "./@READ_WRITE_DMG_NAME@" -format UDZO -imagekey zlib-level=9 -o "./@READ_ONLY_DMG_NAME@"
-               RESULT_VARIABLE _result
-               COMMAND_ECHO STDOUT )
-message(STATUS "Result of hdiutil convert = ${_result}")
+# Report any error
+if(NOT (${_result} EQUAL "0") )
+   message(SEND_ERROR "Error(s)\n: ${_error}")
+   message(FATAL_ERROR "Script Faild: see above")
+else()
+   message(STATUS "Script Succeeded")
+endif()