[Cmake-commits] CMake branch, next, updated. v3.5.2-1500-g89e30ba

[Robert Maynard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  89e30ba9b52013cf8cb923942e205be4a4354784 (commit)
       via  d3812437036e95329fbee0773282b88e8b013fbe (commit)
      from  0a67a1180fc50eade5a753c8c2ec994865084eb7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89e30ba9b52013cf8cb923942e205be4a4354784
commit 89e30ba9b52013cf8cb923942e205be4a4354784
Merge: 0a67a11 d381243
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu May 19 11:43:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 19 11:43:16 2016 -0400

    Merge topic 'make_osx_packaging_more_robust' into next
    
    d3812437 Make packaging script wait for the disk image to be mounted.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3812437036e95329fbee0773282b88e8b013fbe
commit d3812437036e95329fbee0773282b88e8b013fbe
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu May 19 11:41:48 2016 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Thu May 19 11:41:48 2016 -0400

    Make packaging script wait for the disk image to be mounted.
    
    Frequently the apple script would execute before the disk image had been
    fully mounted, and would fail. We now try to wait for the disk to be
    mounted first.

diff --git a/Packaging/CMakeDMGSetup.scpt b/Packaging/CMakeDMGSetup.scpt
index c7ddcfb..37e7bd1 100644
--- a/Packaging/CMakeDMGSetup.scpt
+++ b/Packaging/CMakeDMGSetup.scpt
@@ -4,6 +4,21 @@ on run argv
   tell application "Finder"
   tell disk image_name
 
+    -- wait for the image to finish mounting
+    set open_attempts to 0
+    repeat while open_attempts < 4
+      try
+        open
+          delay 1
+          set open_attempts to 5
+        close
+      on error errStr number errorNumber
+        set open_attempts to open_attempts + 1
+        delay 10
+      end try
+    end repeat
+    delay 5
+
     -- open the image the first time and save a DS_Store with just
     -- background and icon setup
     open
@@ -12,7 +27,7 @@ on run argv
       set background picture of theViewOptions to file ".background:background.tif"
       set arrangement of theViewOptions to not arranged
       set icon size of theViewOptions to 128
-      delay 1
+      delay 5
     close
 
     -- next setup the position of the app and Applications symlink
@@ -28,7 +43,7 @@ on run argv
         set position of item "Applications" to { 378, 200 }
       end tell
       update without registering applications
-      delay 1
+      delay 5
     close
 
     -- one last open and close so you can see everything looks correct

-----------------------------------------------------------------------

Summary of changes:
 Packaging/CMakeDMGSetup.scpt |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake