[Cmake-commits] [cmake-commits] david.cole committed CPack.OSXScriptLauncher.in 1.1 1.2 CPack.OSXScriptLauncher.rsrc.in NONE 1.1 CPack.OSXX11.Info.plist.in 1.1 1.2 CPack.OSXX11.main.scpt.in NONE 1.1 CPack.RuntimeScript.in 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17791/Modules

Modified Files:
	CPack.OSXScriptLauncher.in CPack.OSXX11.Info.plist.in 
	CPack.RuntimeScript.in 
Added Files:
	CPack.OSXScriptLauncher.rsrc.in CPack.OSXX11.main.scpt.in 
Log Message:
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.


Index: CPack.RuntimeScript.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.RuntimeScript.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CPack.RuntimeScript.in	9 Jun 2008 19:50:11 -0000	1.4
--- CPack.RuntimeScript.in	21 Jan 2009 16:54:29 -0000	1.5
***************
*** 7,10 ****
--- 7,30 ----
  
  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%%\.*}
***************
*** 43,46 ****
--- 63,67 ----
  fi
  __END_OF_GETDISPLAY_SCRIPT__
+ fi
  chmod +x "$TMP/getdisplay.sh"
  rm -f $TMP/display

--- NEW FILE: CPack.OSXScriptLauncher.rsrc.in ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: CPack.OSXX11.main.scpt.in ---
(This appears to be a binary file; contents omitted.)

Index: CPack.OSXScriptLauncher.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.OSXScriptLauncher.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
Binary files /tmp/cvsKgMWx4 and /tmp/cvswZEWVU differ

Index: CPack.OSXX11.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.OSXX11.Info.plist.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CPack.OSXX11.Info.plist.in	10 Jan 2007 20:30:25 -0000	1.1
--- CPack.OSXX11.Info.plist.in	21 Jan 2009 16:54:29 -0000	1.2
***************
*** 5,8 ****
--- 5,21 ----
  	<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>