Changeset: 608cb7443541 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/608cb7443541
Added Files:
common/utils/GenerateVersionHeader.cmake
Modified Files:
CMakeLists.txt
cmake/monetdb-functions.cmake
common/utils/CMakeLists.txt
Branch: Jun2023
Log Message:
Make sure the MERCURIAL_ID define is always up to date.
diffs (161 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ include(monetdb-toolchain)
monetdb_default_compiler_options()
include(monetdb-defines)
-monetdb_hg_revision()
# required for symbol existance tests
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -8,59 +8,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
#]]
-function(monetdb_hg_revision)
- # Get the current version control revision
- if(EXISTS "${CMAKE_SOURCE_DIR}/.hg_archival.txt")
- 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(WARNING "Failed to find mercurial ID")
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
- elseif(EXISTS "${CMAKE_SOURCE_DIR}/.hg")
- find_package(Hg)
- if(HG_FOUND)
- message("hg found: ${HG_EXECUTABLE}")
- else()
- message(WARNING "Failed to find mercurial")
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
- execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-i" 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)
- else()
- message(WARNING "Failed to find mercurial ID")
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
- elseif(EXISTS "${CMAKE_SOURCE_DIR}/.git")
- find_package(Git)
- if(GIT_FOUND)
- message("git found: ${GIT_EXECUTABLE}")
- else()
- message(WARNING "Failed to find git")
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
- execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short" "HEAD"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
- RESULT_VARIABLE GIT_RETURN_CODE OUTPUT_VARIABLE GIT_OUPUT_RES
OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(GIT_RETURN_CODE EQUAL 0 AND GIT_OUPUT_RES)
- set(MERCURIAL_ID "${GIT_OUPUT_RES}" PARENT_SCOPE)
- else()
- message(WARNING "Failed to find git ID")
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
- else()
- set(MERCURIAL_ID "Unknown" PARENT_SCOPE)
- endif()
-endfunction()
-
function(add_option_if_available Flag)
string(REGEX REPLACE "[-/=,]" "" FLAG_TEST "${Flag}")
check_c_compiler_flag(${Flag} ${FLAG_TEST}_FOUND)
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -8,9 +8,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
#]]
-configure_file(monetdb_hgversion.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/monetdb_hgversion.h)
-
add_library(mutils STATIC)
target_sources(mutils
@@ -41,6 +38,14 @@ set_target_properties(mutils
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER mutils.h)
+add_custom_target(version
+ ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/monetdb_hgversion.h.in
+ -D DST=${CMAKE_CURRENT_BINARY_DIR}/monetdb_hgversion.h
+ -D DIR=${CMAKE_SOURCE_DIR}
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/GenerateVersionHeader.cmake
+ )
+add_dependencies(mutils version)
+
add_library(mcrypt STATIC)
target_sources(mcrypt
diff --git a/common/utils/GenerateVersionHeader.cmake
b/common/utils/GenerateVersionHeader.cmake
new file mode 100644
--- /dev/null
+++ b/common/utils/GenerateVersionHeader.cmake
@@ -0,0 +1,54 @@
+# Get the current version control revision
+message("dir is ${DIR}.")
+if(EXISTS "${DIR}/.hg_archival.txt")
+ file(READ "${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}")
+ else()
+ set(MERCURIAL_ID "${HG_NODE}")
+ endif()
+ else()
+ message(WARNING "Failed to find mercurial ID")
+ set(MERCURIAL_ID "Unknown")
+ endif()
+elseif(EXISTS "${DIR}/.hg")
+ find_package(Hg)
+ if(HG_FOUND)
+ message("hg found: ${HG_EXECUTABLE}")
+ else()
+ message(WARNING "Failed to find mercurial")
+ set(MERCURIAL_ID "Unknown")
+ endif()
+ execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-i" WORKING_DIRECTORY
"${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}")
+ else()
+ message(WARNING "Failed to find mercurial ID")
+ set(MERCURIAL_ID "Unknown")
+ endif()
+elseif(EXISTS "${DIR}/.git")
+ find_package(Git)
+ if(GIT_FOUND)
+ message("git found: ${GIT_EXECUTABLE}")
+ else()
+ message(WARNING "Failed to find git")
+ set(MERCURIAL_ID "Unknown")
+ endif()
+ execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short" "HEAD"
WORKING_DIRECTORY "${DIR}"
+ RESULT_VARIABLE GIT_RETURN_CODE OUTPUT_VARIABLE GIT_OUPUT_RES
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(GIT_RETURN_CODE EQUAL 0 AND GIT_OUPUT_RES)
+ set(MERCURIAL_ID "${GIT_OUPUT_RES}")
+ else()
+ message(WARNING "Failed to find git ID")
+ set(MERCURIAL_ID "Unknown")
+ endif()
+else()
+ set(MERCURIAL_ID "Unknown")
+endif()
+
+message("Configure ${SRC} with ${MERCURIAL_ID}.")
+configure_file(${SRC} ${DST} @ONLY)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
