Mac Info.plist svn=>git

qgis · May 11, 2011 · 76751f6 · 76751f6
1 parent 3ffc255
commit 76751f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/mac/Contents/CMakeLists.txt b/src/mac/Contents/CMakeLists.txt
@@ -4,12 +4,12 @@
 
 SET(COMPLETE_VERSION_WITH_RELEASE_NAME \"${COMPLETE_VERSION}-${RELEASE_NAME}\")
 
-IF (NOT EXISTS SVN_MARKER)
-  SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt)  # Dummy file
-ENDIF (NOT EXISTS SVN_MARKER)
+IF (NOT EXISTS GIT_MARKER)
+  SET (GIT_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt)  # Dummy file
+ENDIF (NOT EXISTS GIT_MARKER)
 
 ADD_CUSTOM_TARGET(Info.plist ALL
-  DEPENDS ${SVN_MARKER}
+  DEPENDS ${GIT_MARKER}
   COMMAND ${CMAKE_COMMAND}
     -D CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
     -D SOURCE_DIR=${CMAKE_SOURCE_DIR}

diff --git a/src/mac/Contents/Info.plist.cmake b/src/mac/Contents/Info.plist.cmake
@@ -1,14 +1,14 @@
 SET(CMAKE_BACKWARDS_COMPATIBILITY "2.4")
 
-# See if we have svn installed
-FIND_PROGRAM(SVNVERSION svnversion)
+# See if we have git installed
+FIND_PROGRAM (GIT git)
 
 # Read the revision if installed, else set to "unknown"
-IF (SVNVERSION)
-  EXEC_PROGRAM (${SVNVERSION} ARGS ${SOURCE_DIR} OUTPUT_VARIABLE REVISION)
-ELSE (SVNVERSION)
+IF (GIT)
+  EXEC_PROGRAM (${GIT} ${SOURCE_DIR} ARGS "log -n1 --pretty=%h" OUTPUT_VARIABLE REVISION)
+ELSE (GIT)
   SET (REVISION unknown)
-ENDIF (SVNVERSION)
+ENDIF (GIT)
 
 # Create Info.plist
 CONFIGURE_FILE (${CURRENT_SOURCE_DIR}/Info.plist.in

diff --git a/src/mac/Contents/Info.plist.in b/src/mac/Contents/Info.plist.in
@@ -15,7 +15,7 @@
 	<key>CFBundleSignature</key>
 	<string>QGIS</string>
 	<key>CFBundleGetInfoString</key>
-	<string>QGIS @VERSION@ (@REVISION@), © 2002-2010 QGIS Development Team</string>
+	<string>QGIS @VERSION@ (@REVISION@), © 2002-2011 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>@VERSION_NUM@</string>
 	<key>CFBundleVersion</key>