fix display of version in doxymentation

qgis · May 5, 2016 · e040cbd · e040cbd
1 parent 8e781b4
commit e040cbd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -767,14 +767,18 @@ IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
     ENDIF(WIN32)
   ELSE(GITCOMMAND)
     MESSAGE(STATUS "git marker, but no git found - version will be unknown")
-    SET(REVISION "unknown")
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "${COMPLETE_VERSION}-${RELEASE_NAME}")
+    IF(NOT SHA)
+      SET(SHA "unknown")
+    ENDIF(NOT SHA)
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
   ENDIF(GITCOMMAND)
 ELSE (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
-  SET(REVISION "exported")
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "${COMPLETE_VERSION}-${RELEASE_NAME}")
+  IF(NOT SHA)
+    SET(SHA "exported")
+  ENDIF(NOT SHA)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
 ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 
 ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)

diff --git a/debian/rules b/debian/rules
@@ -77,6 +77,10 @@ CMAKE_OPTS := \
 	-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
 	-DQT_DOC_URL=/usr/share/qt4/doc/html/
 
+ifneq ($(SHA),)
+	CMAKE_OPTS += -DSHA=$(SHA)
+endif
+
 ifeq ($(GRASSVER),7)
 	CMAKE_OPTS += \
 		-DWITH_GRASS=TRUE \

diff --git a/mac/app.info.plist.in b/mac/app.info.plist.in
@@ -15,11 +15,11 @@
 	<key>CFBundleSignature</key>
 	<string>QGIS</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team</string>
+	<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${COMPLETE_VERSION}</string>
 	<key>CFBundleVersion</key>
-	<string>${COMPLETE_VERSION} (${REVISION})</string>
+	<string>${COMPLETE_VERSION} (${SHA})</string>
 	<key>CFBundleIconFile</key>
 	<string>qgis.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git a/mac/browser.info.plist.in b/mac/browser.info.plist.in
@@ -15,11 +15,11 @@
 	<key>CFBundleSignature</key>
 	<string>QGSB</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team</string>
+	<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${COMPLETE_VERSION}</string>
 	<key>CFBundleVersion</key>
-	<string>${COMPLETE_VERSION} (${REVISION})</string>
+	<string>${COMPLETE_VERSION} (${SHA})</string>
 	<key>CFBundleIconFile</key>
 	<string>qgisb.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>