nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1101

Browse Source 
56ff099 fixed tag detector (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2016-09-18 21:38:21 +02:00
commit 5866d91b82
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/version.cmake
View File

@ -41,43 +41,23 @@ else()
message(STATUS "You are currently on commit ${COMMIT}") message(STATUS "You are currently on commit ${COMMIT}")
# Get all the tags # Get all the tags
execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMITOUT OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
# Make sure we actually got some tags if(NOT TAGGEDCOMMIT)
if(TAGGEDCOMMITOUT) message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
string(LENGTH ${TAGGEDCOMMITOUT} TLEN) set(VERSIONTAG "${COMMIT}")
else() else()
set(TLEN 1) message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
endif()
# Check if we're building that tagged commit or a different one
if(RET OR TLEN LESS 5) if(COMMIT STREQUAL TAGGEDCOMMIT)
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") message(STATUS "You are building a tagged release")
set(VERSIONTAG "${COMMIT}") set(VERSIONTAG "release")
else() else()
# Replace a bunch of things so we end up with a semi-colon separated list message(STATUS "You are ahead of or behind a tagged release")
string(REPLACE " refs/" "\n" TAGGEDCOMMITOUT2 ${TAGGEDCOMMITOUT}) set(VERSIONTAG "${COMMIT}")
string(REPLACE "\n" ";" TAGGEDCOMMITLIST ${TAGGEDCOMMITOUT2}) endif()
endif()
# Grab the second-last item in the list, as that will be the hash of our most recent commit
list(GET TAGGEDCOMMITLIST -2 TAGGEDCOMMIT)
if(NOT TAGGEDCOMMIT)
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
set(VERSIONTAG "${COMMIT}")
else()
message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
# Check if we're building that tagged commit or a different one
if(COMMIT STREQUAL TAGGEDCOMMIT)
message(STATUS "You are building a tagged release")
set(VERSIONTAG "release")
else()
message(STATUS "You are ahead of or behind a tagged release")
set(VERSIONTAG "${COMMIT}")
endif()
endif()
endif()
configure_file("src/version.h.in" "${TO}") configure_file("src/version.h.in" "${TO}")
endif() endif()