Skip to content

Commit e040cbd

Browse files
committed
fix display of version in doxymentation
1 parent 8e781b4 commit e040cbd

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

CMakeLists.txt

+10-6
Original file line numberDiff line numberDiff line change
@@ -767,14 +767,18 @@ IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
767767
ENDIF(WIN32)
768768
ELSE(GITCOMMAND)
769769
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
770-
SET(REVISION "unknown")
771-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
772-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "${COMPLETE_VERSION}-${RELEASE_NAME}")
770+
IF(NOT SHA)
771+
SET(SHA "unknown")
772+
ENDIF(NOT SHA)
773+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
774+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
773775
ENDIF(GITCOMMAND)
774776
ELSE (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
775-
SET(REVISION "exported")
776-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
777-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "${COMPLETE_VERSION}-${RELEASE_NAME}")
777+
IF(NOT SHA)
778+
SET(SHA "exported")
779+
ENDIF(NOT SHA)
780+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
781+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
778782
ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
779783

780784
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)

debian/rules

+4
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ CMAKE_OPTS := \
7777
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
7878
-DQT_DOC_URL=/usr/share/qt4/doc/html/
7979

80+
ifneq ($(SHA),)
81+
CMAKE_OPTS += -DSHA=$(SHA)
82+
endif
83+
8084
ifeq ($(GRASSVER),7)
8185
CMAKE_OPTS += \
8286
-DWITH_GRASS=TRUE \

mac/app.info.plist.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundleSignature</key>
1616
<string>QGIS</string>
1717
<key>CFBundleGetInfoString</key>
18-
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team</string>
18+
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team</string>
1919
<key>CFBundleShortVersionString</key>
2020
<string>${COMPLETE_VERSION}</string>
2121
<key>CFBundleVersion</key>
22-
<string>${COMPLETE_VERSION} (${REVISION})</string>
22+
<string>${COMPLETE_VERSION} (${SHA})</string>
2323
<key>CFBundleIconFile</key>
2424
<string>qgis.icns</string>
2525
<key>CFBundleInfoDictionaryVersion</key>

mac/browser.info.plist.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundleSignature</key>
1616
<string>QGSB</string>
1717
<key>CFBundleGetInfoString</key>
18-
<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team</string>
18+
<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team</string>
1919
<key>CFBundleShortVersionString</key>
2020
<string>${COMPLETE_VERSION}</string>
2121
<key>CFBundleVersion</key>
22-
<string>${COMPLETE_VERSION} (${REVISION})</string>
22+
<string>${COMPLETE_VERSION} (${SHA})</string>
2323
<key>CFBundleIconFile</key>
2424
<string>qgisb.icns</string>
2525
<key>CFBundleInfoDictionaryVersion</key>

0 commit comments

Comments
 (0)