--- a/cmake/Version.cmake 2018-04-10 12:18:42.000000000 +0200 +++ b/cmake/Version.cmake 2018-05-11 23:29:24.499906356 +0200 @@ -23,7 +23,7 @@ if (DEFINED ENV{SYNERGY_VERSION_PATCH}) set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) else() - set (SYNERGY_VERSION_PATCH 0) + set (SYNERGY_VERSION_PATCH 1) message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") endif() endif() @@ -36,29 +36,6 @@ endif() endif() -if (NOT DEFINED SYNERGY_REVISION) - if (DEFINED ENV{GIT_COMMIT}) - string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) - elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot") - execute_process ( - COMMAND git rev-parse --short=8 HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE SYNERGY_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() -endif() - -if (DEFINED SYNERGY_REVISION) - string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH) - if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8"))) - message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash") - endif() - unset (SYNERGY_REVISION_LENGTH) -else() - set (SYNERGY_REVISION "0badc0de") -endif() - if (DEFINED ENV{BUILD_NUMBER}) set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) else() @@ -66,7 +43,6 @@ endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) -set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}") if (SYNERGY_VERSION_STAGE STREQUAL "snapshot") set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") @@ -80,7 +56,6 @@ add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}") add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}") -add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}") add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}") add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER})