[Cmake-commits] [cmake-commits] hoffman committed CPack.RuntimeScript.in 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	CPack.RuntimeScript.in 
Log Message:
ENH: fix x11 launch script for leopord x11 is auto-started for us on that os.


Index: CPack.RuntimeScript.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.RuntimeScript.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CPack.RuntimeScript.in	10 Jan 2007 23:33:03 -0000	1.2
--- CPack.RuntimeScript.in	11 Apr 2008 14:41:28 -0000	1.3
***************
*** 6,9 ****
--- 6,29 ----
  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
  ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
  if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
***************
*** 43,45 ****
--- 63,66 ----
    shift
  fi
+ fi
  exec "$CWD/bin/@CPACK_EXECUTABLE_NAME@" "$@" > /tmp/slicer.output 2>&1