From c995b8309c92ab3dd1b4e2361b8af0684fe50ee8 Mon Sep 17 00:00:00 2001 From: Philip Rinn Date: Mon, 28 May 2012 13:46:45 +0200 Subject: [PATCH] Unify generation of AboutThisBuild.txt and rtgui/version.h. See issue 1377. --- About-Linux.cmake | 29 ----------------------- About-Windows.cmake | 29 ----------------------- About-Apple.cmake => AboutThisBuild.cmake | 13 +++++++--- CMakeLists.txt | 6 ++--- 4 files changed, 13 insertions(+), 64 deletions(-) delete mode 100644 About-Linux.cmake delete mode 100644 About-Windows.cmake rename About-Apple.cmake => AboutThisBuild.cmake (85%) diff --git a/About-Linux.cmake b/About-Linux.cmake deleted file mode 100644 index 6b77827b5..000000000 --- a/About-Linux.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# cmakefile executed within a makefile target - -# we look for the hg command in this paths by order of preference -find_file(HG_CMD hg) - - -# the hg command is looked for again, at build time -if (HG_CMD STREQUAL HG_CMD-NOTFOUND) - message(FATAL_ERROR "hg command not found!") -else (HG_CMD STREQUAL HG_CMD-NOTFOUND) - message(STATUS "hg command found: ${HG_CMD}") -endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) - -set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") -set (SHELL "/bin/bash") -# there should be a better way of getting the compiler + compiler version, not restrained to Gcc -execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE) -if (CACHE_NAME_SUFFIX STREQUAL "") - execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) -endif () - -# build version.h from template -configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h) -# build AboutThisBuild.txt from template -configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt) diff --git a/About-Windows.cmake b/About-Windows.cmake deleted file mode 100644 index abfd7a572..000000000 --- a/About-Windows.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# cmakefile executed within a makefile target - -# we look for the hg command in this paths by order of preference -find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../) - - -# the hg command is looked for again, at build time -if (HG_CMD STREQUAL HG_CMD-NOTFOUND) - message(FATAL_ERROR "hg command not found!") -else (HG_CMD STREQUAL HG_CMD-NOTFOUND) - message(STATUS "hg command found: ${HG_CMD}") -endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) - -set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") - -# there should be a better way of getting the compiler + compiler version, not restrained to Gcc -execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE) -if (CACHE_NAME_SUFFIX STREQUAL "") - execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) -endif () - -# build version.h from template -configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h) -# build AboutThisBuild.txt from template -configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt) diff --git a/About-Apple.cmake b/AboutThisBuild.cmake similarity index 85% rename from About-Apple.cmake rename to AboutThisBuild.cmake index 0d0a3d55d..33caa64e0 100644 --- a/About-Apple.cmake +++ b/AboutThisBuild.cmake @@ -1,8 +1,16 @@ # cmakefile executed within a makefile target # we look for the hg command in this paths by order of preference -find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") -find_file(HG_CMD hg) +if (WIN32) + find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../) +elseif (APPLE) + find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") + find_file(HG_CMD hg) + set (SHELL "/bin/bash") +else (WIN32) # Linux + find_file(HG_CMD hg) + set (SHELL "/bin/bash") +endif (WIN32) # the hg command is looked for again, at build time if (HG_CMD STREQUAL HG_CMD-NOTFOUND) @@ -12,7 +20,6 @@ else (HG_CMD STREQUAL HG_CMD-NOTFOUND) endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") -set (SHELL "/bin/bash") # there should be a better way of getting the compiler + compiler version, not restrained to Gcc execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/CMakeLists.txt b/CMakeLists.txt index bffa9bfac..e9f371575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ else (AUTOMATED_BUILD_SYSTEM) -DLFLAGS:STRING=\"${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}\" -DOPTION_OMP:STRING=${OPTION_OMP} -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Windows.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.cmake COMMENT "Creating the about file" ) find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../) @@ -251,7 +251,7 @@ else (AUTOMATED_BUILD_SYSTEM) -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} -DOPTION_OMP:STRING=${OPTION_OMP} -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Apple.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.cmake COMMENT "Creating the about file" ) find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") @@ -272,7 +272,7 @@ else (AUTOMATED_BUILD_SYSTEM) -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} -DOPTION_OMP:STRING=${OPTION_OMP} -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.cmake COMMENT "Creating the about file" ) find_file(HG_CMD hg)