[QGIS Commit] r8600 - trunk/qgis/src/mac/Contents

[svn_qgis at osgeo.org]

Author: telwertowski
Date: 2008-06-06 02:10:56 -0400 (Fri, 06 Jun 2008)
New Revision: 8600

Added:
   trunk/qgis/src/mac/Contents/Info.plist.cmake
Modified:
   trunk/qgis/src/mac/Contents/CMakeLists.txt
   trunk/qgis/src/mac/Contents/Info.plist.in
Log:
Use cmake script with CONFIGURE_FILE rather than grep/sed to create Mac Info.plist. This circumvents command-line quoting problems when upgrading to CMake 2.6.


Modified: trunk/qgis/src/mac/Contents/CMakeLists.txt
===================================================================
--- trunk/qgis/src/mac/Contents/CMakeLists.txt	2008-06-06 05:48:39 UTC (rev 8599)
+++ trunk/qgis/src/mac/Contents/CMakeLists.txt	2008-06-06 06:10:56 UTC (rev 8600)
@@ -3,21 +3,12 @@
 # create Info.plist
 
 ADD_CUSTOM_TARGET(Info.plist ALL
-                  VERSION=`grep VERSION ${CMAKE_BINARY_DIR}/qgsconfig.h | head -1 |
-                           sed -e "s/#define VERSION //"
-                               -e "s/\\\"//g"` &&
-                  SVNVERSION=`grep QGSSVNVERSION ${CMAKE_BINARY_DIR}/qgssvnversion.h |
-                              sed -e "s/#define QGSSVNVERSION //"
-                                  -e "s/\\\"//g"` &&
-                  sed -e "s/@VERSION/$$VERSION/"
-                      -e "s/@SHORTVERSION/$$VERSION/"
-                      -e "s/@SVNVERSION/$$SVNVERSION/"
-                      < ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in > Info.plist
-                  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
-                          ${CMAKE_BINARY_DIR}/qgsconfig.h)
+  DEPENDS ${SVN_MARKER}
+  COMMAND ${CMAKE_COMMAND}
+    -D CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+    -D VERSION=${COMPLETE_VERSION}-${RELEASE_NAME}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.cmake)
 
-ADD_DEPENDENCIES(Info.plist svnversion)
-
 #############################################################
 # process subdirs
 

Added: trunk/qgis/src/mac/Contents/Info.plist.cmake
===================================================================
--- trunk/qgis/src/mac/Contents/Info.plist.cmake	                        (rev 0)
+++ trunk/qgis/src/mac/Contents/Info.plist.cmake	2008-06-06 06:10:56 UTC (rev 8600)
@@ -0,0 +1,15 @@
+SET(CMAKE_BACKWARDS_COMPATIBILITY "2.4")
+
+# See if we have svn installed
+FIND_PROGRAM(SVNVERSION svnversion)
+
+# Read the revision if installed, else set to "unknown"
+IF (SVNVERSION)
+  EXEC_PROGRAM (${SVNVERSION} ARGS ${CURRENT_SOURCE_DIR} OUTPUT_VARIABLE REVISION)
+ELSE (SVNVERSION)
+  SET (REVISION unknown)
+ENDIF (SVNVERSION)
+
+# Create Info.plist
+CONFIGURE_FILE (${CURRENT_SOURCE_DIR}/Info.plist.in
+                ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)


Property changes on: trunk/qgis/src/mac/Contents/Info.plist.cmake
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/qgis/src/mac/Contents/Info.plist.in
===================================================================
--- trunk/qgis/src/mac/Contents/Info.plist.in	2008-06-06 05:48:39 UTC (rev 8599)
+++ trunk/qgis/src/mac/Contents/Info.plist.in	2008-06-06 06:10:56 UTC (rev 8600)
@@ -11,11 +11,11 @@
 	<key>CFBundleSignature</key>
 	<string>QGIS</string>
 	<key>CFBundleGetInfoString</key>
-	<string>QGIS @VERSION (@SVNVERSION), © 2002-2008 QGIS Development Team</string>
+	<string>QGIS @VERSION@ (@REVISION@), © 2002-2008 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@SHORTVERSION (@SVNVERSION)</string>
+	<string>@VERSION@ (@REVISION@)</string>
 	<key>CFBundleVersion</key>
-	<string>@VERSION</string>
+	<string>@VERSION@ (@REVISION@)</string>
 	<key>CFBundleIconFile</key>
 	<string>qgis.icns</string>
 	<key>CFBundleDocumentTypes</key>
@@ -176,15 +176,17 @@
 	</array>
 	<key>CFBundleLocalizations</key>
 	<array>
+		<string>en</string>
 		<string>ar</string>
-		<string>en</string>
 		<string>cs_CZ</string>
 		<string>de</string>
 		<string>es</string>
 		<string>fr</string>
+		<string>hu</string>
 		<string>id</string>
 		<string>it</string>
 		<string>ja</string>
+		<string>lo</string>
 		<string>lt</string>
 		<string>lv</string>
 		<string>mn</string>