Changeset: be87bee659fe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/be87bee659fe Modified Files: cmake/monetdb-functions.cmake Branch: Jul2021 Log Message:
Add local revision number to --version output if built from tar ball and available. diffs (23 lines): diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake --- a/cmake/monetdb-functions.cmake +++ b/cmake/monetdb-functions.cmake @@ -9,10 +9,15 @@ function(monetdb_hg_revision) # Get the current version control revision if(EXISTS "${CMAKE_SOURCE_DIR}/.hg_archival.txt") - execute_process(COMMAND "sed" "-n" "s/^node: \\([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]\\).*/\\1/p" ".hg_archival.txt" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE HG_RETURN_CODE - OUTPUT_VARIABLE HG_OUPUT_RES OUTPUT_STRIP_TRAILING_WHITESPACE) - if(HG_RETURN_CODE EQUAL 0 AND HG_OUPUT_RES) - set(MERCURIAL_ID "${HG_OUPUT_RES}" PARENT_SCOPE) + file(READ "${CMAKE_SOURCE_DIR}/.hg_archival.txt" HG_ARCHIVAL) + if(HG_ARCHIVAL MATCHES ".*node:.*") + string(REGEX REPLACE ".*node: ([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]).*" "\\1" HG_NODE "${HG_ARCHIVAL}") + if(HG_ARCHIVAL MATCHES ".*local:.*") + string(REGEX REPLACE ".*local: ([0-9][0-9]*).*" "\\1" HG_LOCAL "${HG_ARCHIVAL}") + set(MERCURIAL_ID "${HG_NODE} ${HG_LOCAL}" PARENT_SCOPE) + else() + set(MERCURIAL_ID "${HG_NODE}" PARENT_SCOPE) + endif() else() message(FATAL_ERROR "Failed to find mercurial ID") endif() _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list