diff --git a/CMakeLists.txt b/CMakeLists.txt index 45f3694ac70..16749dff390 100644 --- 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 index 22a07563936..bc2030d466d 100755 --- 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 index 83ad9d4439f..5c103012b61 100644 --- a/mac/app.info.plist.in +++ b/mac/app.info.plist.in @@ -15,11 +15,11 @@ CFBundleSignature QGIS CFBundleGetInfoString - ${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team + ${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team CFBundleShortVersionString ${COMPLETE_VERSION} CFBundleVersion - ${COMPLETE_VERSION} (${REVISION}) + ${COMPLETE_VERSION} (${SHA}) CFBundleIconFile qgis.icns CFBundleInfoDictionaryVersion diff --git a/mac/browser.info.plist.in b/mac/browser.info.plist.in index 1b92f5d26f9..38617f88565 100644 --- a/mac/browser.info.plist.in +++ b/mac/browser.info.plist.in @@ -15,11 +15,11 @@ CFBundleSignature QGSB CFBundleGetInfoString - ${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2015 QGIS Development Team + ${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team CFBundleShortVersionString ${COMPLETE_VERSION} CFBundleVersion - ${COMPLETE_VERSION} (${REVISION}) + ${COMPLETE_VERSION} (${SHA}) CFBundleIconFile qgisb.icns CFBundleInfoDictionaryVersion