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

m-eik at users.sourceforge.net m-eik at users.sourceforge.net
Mon Jan 9 18:18:42 UTC 2012


Revision: 4149
          http://rkward.svn.sourceforge.net/rkward/?rev=4149&view=rev
Author:   m-eik
Date:     2012-01-09 18:18:42 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
use cmake to set version string in Info.plist and version.h (could be added to the R package too, so the version number needs only to be changed in one place?)

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt

Added Paths:
-----------
    trunk/rkward/rkward/Info.plist.template
    trunk/rkward/rkward/version.h.template

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2012-01-09 17:12:39 UTC (rev 4148)
+++ trunk/rkward/rkward/CMakeLists.txt	2012-01-09 18:18:42 UTC (rev 4149)
@@ -1,3 +1,12 @@
+# set version number
+file (STRINGS "resource.ver" RKVERSION_NUMBER)
+SET(RKWARD_VERSION_TEMPLATE version.h.template)
+SET(RKWARD_VERSION_FILE ${CMAKE_SOURCE_DIR}/rkward/version.h)
+CONFIGURE_FILE(
+	${RKWARD_VERSION_TEMPLATE}
+	${RKWARD_VERSION_FILE}
+	@ONLY)
+
 IF(Q_WS_MAC)
 	SET(RKWARD_FRONTEND_LOCATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
 	SET(CPACK_BUNDLE_ICON rkward.icns)
@@ -64,6 +73,15 @@
 	@ONLY)
 ADD_DEPENDENCIES(rkward.frontend ${RKWARD_WRAPPER_SCRIPT})
 
+IF(Q_WS_MAC)
+	SET(RKWARD_INFOPLIST_TEMPLATE Info.plist.template)
+	SET(RKWARD_INFOPLIST_FILE ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
+	CONFIGURE_FILE(
+		${RKWARD_INFOPLIST_TEMPLATE}
+		${RKWARD_INFOPLIST_FILE}
+		@ONLY)
+ENDIF(Q_WS_MAC)
+
 TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ktexteditor ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KROSSCORE_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
 
 ########### install files ###############
@@ -77,7 +95,7 @@
 	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)
+	INSTALL(FILES ${RKWARD_INFOPLIST_FILE} DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents)
 ELSE(Q_WS_MAC)
 	INSTALL(TARGETS rkward.frontend DESTINATION ${LIBEXEC_INSTALL_DIR})
 	INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})

Added: trunk/rkward/rkward/Info.plist.template
===================================================================
--- trunk/rkward/rkward/Info.plist.template	                        (rev 0)
+++ trunk/rkward/rkward/Info.plist.template	2012-01-09 18:18:42 UTC (rev 4149)
@@ -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>KDE frontend to the R statistics language</string>
+        <key>CFBundleIconFile</key>
+        <string>rkward.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string></string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleLongVersionString</key>
+        <string>@RKVERSION_NUMBER@</string>
+        <key>CFBundleName</key>
+        <string>RKWard</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>@RKVERSION_NUMBER@</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>

Added: trunk/rkward/rkward/version.h.template
===================================================================
--- trunk/rkward/rkward/version.h.template	                        (rev 0)
+++ trunk/rkward/rkward/version.h.template	2012-01-09 18:18:42 UTC (rev 4149)
@@ -0,0 +1,2 @@
+/* Version number of package */
+#define RKWARD_VERSION "@RKVERSION_NUMBER@"

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





More information about the rkward-tracker mailing list