Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-17 23:34:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6015

Browse Source 
56895ee cmake: Fix generation of version.cpp (ndorf)
This commit is contained in:
luigi1111 2019-10-24 18:39:03 -05:00
commit 2319b9dd9f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
cmake/GenVersion.cmake → cmake/GitVersion.cmake
View File

@ -29,40 +29,46 @@
# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
# Check what commit we're on # Check what commit we're on
execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
if(RET) function (get_version_tag_from_git GIT)
# Something went wrong, set the version tag to -unknown execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD
RESULT_VARIABLE RET
message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.") OUTPUT_VARIABLE COMMIT
set(VERSIONTAG "unknown") OUTPUT_STRIP_TRAILING_WHITESPACE)
set(VERSION_IS_RELEASE "false")
configure_file("src/version.cpp.in" "${TO}") if(RET)
else() # Something went wrong, set the version tag to -unknown
string(SUBSTRING ${COMMIT} 0 9 COMMIT)
message(STATUS "You are currently on commit ${COMMIT}") message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
set(VERSIONTAG "unknown")
# Get all the tags
execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
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}")
set(VERSION_IS_RELEASE "false") set(VERSION_IS_RELEASE "false")
else() else()
message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}") string(SUBSTRING ${COMMIT} 0 9 COMMIT)
message(STATUS "You are currently on commit ${COMMIT}")
# Check if we're building that tagged commit or a different one
if(COMMIT STREQUAL TAGGEDCOMMIT) # Get all the tags
message(STATUS "You are building a tagged release") execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
set(VERSIONTAG "release")
set(VERSION_IS_RELEASE "true") if(NOT TAGGEDCOMMIT)
else() 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 ahead of or behind a tagged release")
set(VERSIONTAG "${COMMIT}") set(VERSIONTAG "${COMMIT}")
set(VERSION_IS_RELEASE "false") set(VERSION_IS_RELEASE "false")
endif() else()
endif() message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
configure_file("src/version.cpp.in" "${TO}") # Check if we're building that tagged commit or a different one
endif() if(COMMIT STREQUAL TAGGEDCOMMIT)
message(STATUS "You are building a tagged release")
set(VERSIONTAG "release")
set(VERSION_IS_RELEASE "true")
else()
message(STATUS "You are ahead of or behind a tagged release")
set(VERSIONTAG "${COMMIT}")
set(VERSION_IS_RELEASE "false")
endif()
endif()
endif()
set(VERSIONTAG "${VERSIONTAG}" PARENT_SCOPE)
set(VERSION_IS_RELEASE "${VERSION_IS_RELEASE}" PARENT_SCOPE)
endfunction()

20
cmake/Version.cmake
View File

@ -26,27 +26,25 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
function (write_static_version_header hash) function (write_version tag)
set(VERSIONTAG "${hash}") set(VERSIONTAG "${tag}" CACHE STRING "The tag portion of the Monero software version" FORCE)
configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
endfunction () endfunction ()
find_package(Git QUIET) find_package(Git QUIET)
if ("$Format:$" STREQUAL "") if ("$Format:$" STREQUAL "")
# We're in a tarball; use hard-coded variables. # We're in a tarball; use hard-coded variables.
write_static_version_header("release") set(VERSION_IS_RELEASE "true")
write_version("release")
elseif (GIT_FOUND OR Git_FOUND) elseif (GIT_FOUND OR Git_FOUND)
message(STATUS "Found Git: ${GIT_EXECUTABLE}") message(STATUS "Found Git: ${GIT_EXECUTABLE}")
add_custom_command( include(GitVersion)
OUTPUT "${CMAKE_BINARY_DIR}/version.cpp" get_version_tag_from_git("${GIT_EXECUTABLE}")
COMMAND "${CMAKE_COMMAND}" write_version("${VERSIONTAG}")
"-D" "GIT=${GIT_EXECUTABLE}"
"-D" "TO=${CMAKE_BINARY_DIR}/version.cpp"
"-P" "cmake/GenVersion.cmake"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
else() else()
message(STATUS "WARNING: Git was not found!") message(STATUS "WARNING: Git was not found!")
write_static_version_header("unknown") set(VERSION_IS_RELEASE "false")
write_version("unknown")
endif () endif ()
add_custom_target(genversion ALL add_custom_target(genversion ALL
DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")