forked from wownero/wownero
Merge pull request #132 from fluffypony/master
versioning now includes the commit hash, or -final for tagged releasesrelease-v0.4.0.1
commit
e7c52d94c0
@ -1,11 +1,25 @@
|
|||||||
execute_process(COMMAND "${GIT}" describe --dirty --match "v${VERSION}" RESULT_VARIABLE RET OUTPUT_VARIABLE DESCRIPTION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND "${GIT}" rev-parse --short HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
if(RET)
|
if(RET)
|
||||||
message(WARNING "Cannot determine current revision. Make sure that you are building either from a Git working tree or from a source archive.")
|
message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
|
||||||
set(VERSION "${COMMIT}")
|
set(VERSIONTAG "unknown")
|
||||||
configure_file("src/version.h.in" "${TO}")
|
configure_file("src/version.h.in" "${TO}")
|
||||||
else()
|
else()
|
||||||
string(REGEX MATCH "([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])?(-dirty)? $" COMMIT "${DESCRIPTION} ")
|
message(STATUS "You are currently on commit ${COMMIT}")
|
||||||
string(STRIP "${COMMIT}" COMMIT)
|
execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev COMMAND awk "END{print $1}" RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
set(VERSION "${COMMIT}")
|
if(RET)
|
||||||
|
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}")
|
||||||
|
if(COMMIT MATCHES TAGGEDCOMMIT)
|
||||||
|
message(STATUS "You are building a tagged release")
|
||||||
|
set(VERSIONTAG "release")
|
||||||
|
else()
|
||||||
|
message(STATUS "You are ahead or behind of a tagged release")
|
||||||
|
set(VERSIONTAG "${COMMIT}")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
configure_file("src/version.h.in" "${TO}")
|
configure_file("src/version.h.in" "${TO}")
|
||||||
endif()
|
endif()
|
@ -1,4 +1,3 @@
|
|||||||
#define BUILD_COMMIT_ID "@VERSION@"
|
#define MONERO_VERSION_TAG "@VERSIONTAG@"
|
||||||
#define PROJECT_VERSION "0.8.8"
|
#define MONERO_VERSION "0.8.8.4"
|
||||||
#define PROJECT_VERSION_BUILD_NO "4"
|
#define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG
|
||||||
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"
|
|
||||||
|
Loading…
Reference in new issue