[rkward-cvs] SF.net SVN: rkward:[4052] trunk/rkward/rkward

[m-eik at users.sourceforge.net]

Revision: 4052
          http://rkward.svn.sourceforge.net/rkward/?rev=4052&view=rev
Author:   m-eik
Date:     2011-11-25 16:17:52 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
adjusted CMake files for Mac OS X bundle installations

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rbackend/CMakeLists.txt
    trunk/rkward/rkward/rkward.sh.template

Added Paths:
-----------
    trunk/rkward/rkward/Info.plist

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2011-11-25 11:46:12 UTC (rev 4051)
+++ trunk/rkward/rkward/CMakeLists.txt	2011-11-25 16:17:52 UTC (rev 4052)
@@ -35,6 +35,16 @@
 GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 
+IF(APPLE)
+	SET(RKWARD_FRONTEND_LOCATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
+	SET(CPACK_BUNDLE_ICON rkward.icns)
+	SET(CPACK_BUNDLE_NAME RKWard)
+	SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
+#	SET(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
+ELSE(APPLE)
+	SET(RKWARD_FRONTEND_LOCATION ${LIBEXEC_INSTALL_DIR})
+ENDIF(APPLE)
+
 KDE4_ADD_EXECUTABLE(rkward.frontend ${RKWard_Sources})
 
 # wrapper script
@@ -59,9 +69,16 @@
 INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}/rkward
 	PATTERN .svn EXCLUDE)
 
-INSTALL(FILES   resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
-INSTALL(TARGETS rkward.frontend DESTINATION ${LIBEXEC_INSTALL_DIR})
-INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(FILES resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
 
+IF(APPLE)
+	INSTALL(TARGETS rkward.frontend DESTINATION ${BIN_INSTALL_DIR})
+	INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents/MacOS)
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/rkward/icons/app-icon/rkward.icns DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents/Resources)
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/rkward/Info.plist DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents)
+ELSE(APPLE)
+	INSTALL(TARGETS rkward.frontend DESTINATION ${LIBEXEC_INSTALL_DIR})
+	INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})
+ENDIF(APPLE)
+
 INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-

Added: trunk/rkward/rkward/Info.plist
===================================================================
--- trunk/rkward/rkward/Info.plist	                        (rev 0)
+++ trunk/rkward/rkward/Info.plist	2011-11-25 16:17:52 UTC (rev 4052)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleExecutable</key>
+        <string>rkward</string>
+        <key>CFBundleGetInfoString</key>
+        <string></string>
+        <key>CFBundleIconFile</key>
+        <string>rkward.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string></string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleLongVersionString</key>
+        <string></string>
+        <key>CFBundleName</key>
+        <string></string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string></string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string></string>
+        <key>CSResourcesFileMapped</key>
+        <true/>
+        <key>LSRequiresCarbon</key>
+        <true/>
+        <key>NSHumanReadableCopyright</key>
+        <string></string>
+</dict>
+</plist>

Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-11-25 11:46:12 UTC (rev 4051)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-11-25 16:17:52 UTC (rev 4052)
@@ -66,7 +66,11 @@
 		# all the KDE library versions, first, when loading DLLs
 		INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rbackend)
 	ELSE(WIN32)
-		INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
+		IF(APPLE)
+			INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
+		ELSE(APPLE)
+			INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
+		ENDIF(APPLE)
 	ENDIF(WIN32)
 ELSE(RBACKEND_SPLIT)
 	SET (

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2011-11-25 11:46:12 UTC (rev 4051)
+++ trunk/rkward/rkward/rkward.sh.template	2011-11-25 16:17:52 UTC (rev 4052)
@@ -49,6 +49,6 @@
 else
   # for regular installations
   export RKWARD_ENSURE_PREFIX="`dirname $0`/.."
-  rkward_binary="@LIBEXEC_INSTALL_DIR@/rkward.frontend"
+  rkward_binary="@RKWARD_FRONTEND_LOCATION@/rkward.frontend"
 fi
 exec $R_binary CMD $debugger ${rkward_binary} "$@"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.