BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch.

5 files changed, 34 insertions, 0 deletions

diff --git a/Modules/CPack.OSXScriptLauncher.in b/Modules/CPack.OSXScriptLauncher.in
index a3e1737..c715860 100755
--- a/Modules/CPack.OSXScriptLauncher.in
+++ b/Modules/CPack.OSXScriptLauncher.in
diff --git a/Modules/CPack.OSXScriptLauncher.rsrc.in b/Modules/CPack.OSXScriptLauncher.rsrc.in
new file mode 100644
index 0000000..5f5f17a
--- /dev/null
+++ b/Modules/CPack.OSXScriptLauncher.rsrc.in
diff --git a/Modules/CPack.OSXX11.Info.plist.in b/Modules/CPack.OSXX11.Info.plist.in
index 30ce2de..851b67b 100644
--- a/Modules/CPack.OSXX11.Info.plist.in
+++ b/Modules/CPack.OSXX11.Info.plist.in
@@ -4,6 +4,19 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+  <key>CFBundleDocumentTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleTypeExtensions</key>
+      <array>
+        <string>@CPACK_FILE_ASSOCIATION_EXTENSION@</string>
+      </array>
+      <key>CFBundleTypeName</key>
+      <string>@CPACK_FILE_ASSOCIATION_TYPE@</string>
+      <key>CFBundleTypeRole</key>
+      <string>Editor</string>
+    </dict>
+  </array>
 	<key>CFBundleExecutable</key>
 	<string>@CPACK_PACKAGE_FILE_NAME@</string>
 	<key>CFBundleGetInfoString</key>
diff --git a/Modules/CPack.OSXX11.main.scpt.in b/Modules/CPack.OSXX11.main.scpt.in
new file mode 100644
index 0000000..de30ea1
--- /dev/null
+++ b/Modules/CPack.OSXX11.main.scpt.in
diff --git a/Modules/CPack.RuntimeScript.in b/Modules/CPack.RuntimeScript.in
index 72dd14e..eaecdd8 100755
--- a/Modules/CPack.RuntimeScript.in
+++ b/Modules/CPack.RuntimeScript.in
@@ -6,6 +6,26 @@ CWD="`dirname \"$0\"`"
 TMP=/tmp/$UID/TemporaryItems
 
 version=`sw_vers -productVersion`
+if [ "$?" == "0" ]; then
+  major=${version%%\.*}
+  rest=${version#*\.}
+  minor=${rest%%\.*}
+  build=${rest#*\.}
+else
+  major=10
+  minor=4
+  build=0
+fi
+
+echo $version
+echo "Major = $major"
+echo "Minor = $minor"
+echo "Build = $build"
+
+
+# if 10.5 or greater, then all the open-x11 stuff need not occur
+if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
+version=`sw_vers -productVersion`
 if [ "$?" = "0" ]; then
   major=${version%%\.*}
   rest=${version#*\.}
@@ -42,6 +62,7 @@ else
     echo \$DISPLAY > "$TMP/display"
 fi
 __END_OF_GETDISPLAY_SCRIPT__
+fi
 chmod +x "$TMP/getdisplay.sh"
 rm -f $TMP/display
 open-x11 $TMP/getdisplay.sh || \