diff --git a/cmake/Version.cmake.orig b/cmake/Version.cmake index ee99f6a..7d019ee 100644 --- a/cmake/Version.cmake.orig +++ b/cmake/Version.cmake @@ -3,11 +3,10 @@ # Version numbers. set(CLEMENTINE_VERSION_MAJOR 1) set(CLEMENTINE_VERSION_MINOR 4) -set(CLEMENTINE_VERSION_PATCH 0) -set(CLEMENTINE_VERSION_PRERELEASE rc2) +set(CLEMENTINE_VERSION_PATCH 1) # This should be set to OFF in a release branch -set(INCLUDE_GIT_REVISION ON) +set(INCLUDE_GIT_REVISION OFF) # Rules about version number comparison on different platforms: # Debian: @@ -103,47 +102,13 @@ set(CLEMENTINE_VERSION_RPM_R "1") set(CLEMENTINE_VERSION_SPARKLE "${majorminorpatch}") set(CLEMENTINE_VERSION_PLIST "4096.${majorminorpatch}") -if(${CLEMENTINE_VERSION_PATCH} EQUAL "0") +if(${CLEMENTINE_VERSION_PATCH} EQUAL "1") set(CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}") -endif(${CLEMENTINE_VERSION_PATCH} EQUAL "0") +endif(${CLEMENTINE_VERSION_PATCH} EQUAL "1") # Add prerelease -if(CLEMENTINE_VERSION_PRERELEASE) - set(CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_DISPLAY} ${CLEMENTINE_VERSION_PRERELEASE}") - set(CLEMENTINE_VERSION_DEB "${CLEMENTINE_VERSION_DEB}~${CLEMENTINE_VERSION_PRERELEASE}") - set(CLEMENTINE_VERSION_RPM_R "0.${CLEMENTINE_VERSION_PRERELEASE}") - set(CLEMENTINE_VERSION_SPARKLE "${CLEMENTINE_VERSION_SPARKLE}${CLEMENTINE_VERSION_PRERELEASE}") set(CLEMENTINE_VERSION_PLIST "${CLEMENTINE_VERSION_PLIST}.0") -else(CLEMENTINE_VERSION_PRERELEASE) set(CLEMENTINE_VERSION_PLIST "${CLEMENTINE_VERSION_PLIST}.1") -endif(CLEMENTINE_VERSION_PRERELEASE) - -# Add git revision -if(FORCE_GIT_REVISION) - set(GIT_REV ${FORCE_GIT_REVISION}) - set(GIT_INFO_RESULT 0) -else(FORCE_GIT_REVISION) - find_program(GIT_EXECUTABLE git) - message(STATUS "Found git: ${GIT_EXECUTABLE}") - - if(NOT GIT_EXECUTABLE-NOTFOUND) - execute_process(COMMAND ${GIT_EXECUTABLE} describe - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - RESULT_VARIABLE GIT_INFO_RESULT - OUTPUT_VARIABLE GIT_REV - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(NOT ${GIT_INFO_RESULT} EQUAL 0) - message(SEND_ERROR "git describe failed with code ${GIT_INFO_RESULT}: ${GIT_REV}") - endif() - endif() -endif() - -string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" - GIT_PARTS ${GIT_REV}) - -if(NOT GIT_PARTS) - message(FATAL_ERROR "Failed to parse git revision string '${GIT_REV}'") -endif(NOT GIT_PARTS) list(LENGTH GIT_PARTS GIT_PARTS_LENGTH) if(GIT_PARTS_LENGTH EQUAL 3)