From 8170b6ed759cdd6a365ec74c7a6a76bfb73b6e9e Mon Sep 17 00:00:00 2001 From: Benitoite Date: Sun, 9 Feb 2020 05:02:50 -0800 Subject: [PATCH 1/7] cmake: gather and display build information Displays unique info: the build OS, the build zulu datetime, the build epoch, and a uuid during cmake configuration. --- UpdateInfo.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake index d1f532506..9aa211d96 100644 --- a/UpdateInfo.cmake +++ b/UpdateInfo.cmake @@ -63,6 +63,11 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) string(REGEX REPLACE "-.*" "" GIT_NUMERIC_VERSION_BS ${GIT_DESCRIBE}) set(GIT_NUMERIC_VERSION_BS "${GIT_NUMERIC_VERSION_BS}.${GIT_COMMITS_SINCE_TAG}") endif() + + execute_process(COMMAND uname -mrs COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_OS OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND date -Ru COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND date +%s COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_EPOCH OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND uuidgen COMMAND tr "A-Z" "a-z" COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_UUID OUTPUT_STRIP_TRAILING_WHITESPACE) message(STATUS "Git checkout information:") message(STATUS " Commit description: ${GIT_DESCRIBE}") @@ -72,6 +77,11 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) message(STATUS " Commits since tag: ${GIT_COMMITS_SINCE_TAG}") message(STATUS " Commits since branch: ${GIT_COMMITS_SINCE_BRANCH}") message(STATUS " Version (unreliable): ${GIT_NUMERIC_VERSION_BS}") + message(STATUS "Build information:") + message(STATUS " Build OS: ${BUILDINFO_OS}") + message(STATUS " Build date: ${BUILDINFO_DATE}") + message(STATUS " Epoch: ${BUILDINFO_EPOCH}") + message(STATUS " UUID: ${BUILDINFO_UUID}") if(NOT DEFINED CACHE_NAME_SUFFIX) set(CACHE_NAME_SUFFIX "${GIT_DESCRIBE}") From 80eb85215ad9c133affcd9996fb5e4dde7e3391e Mon Sep 17 00:00:00 2001 From: Benitoite Date: Sun, 9 Feb 2020 05:05:30 -0800 Subject: [PATCH 2/7] Appends build-unique info to AboutThisBuild.txt --- AboutThisBuild.txt.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AboutThisBuild.txt.in b/AboutThisBuild.txt.in index f48d39b50..d6454d8a0 100644 --- a/AboutThisBuild.txt.in +++ b/AboutThisBuild.txt.in @@ -13,3 +13,7 @@ Build flags: ${CXX_FLAGS} Link flags: ${LFLAGS} OpenMP support: ${OPTION_OMP} MMAP support: ${WITH_MYFILE_MMAP} +Build OS: ${BUILDINFO_OS} +Build date: ${BUILDINFO_DATE} ZULU +Build Epoch: ${BUILDINFO_EPOCH} +Build UUID: ${BUILDINFO_UUID} From 4790eb08b3f6440a7a487375aec2ba2735365157 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Mon, 10 Feb 2020 09:45:39 -0800 Subject: [PATCH 3/7] Epoch -> epoch --- AboutThisBuild.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AboutThisBuild.txt.in b/AboutThisBuild.txt.in index d6454d8a0..06f628187 100644 --- a/AboutThisBuild.txt.in +++ b/AboutThisBuild.txt.in @@ -15,5 +15,5 @@ OpenMP support: ${OPTION_OMP} MMAP support: ${WITH_MYFILE_MMAP} Build OS: ${BUILDINFO_OS} Build date: ${BUILDINFO_DATE} ZULU -Build Epoch: ${BUILDINFO_EPOCH} +Build epoch: ${BUILDINFO_EPOCH} Build UUID: ${BUILDINFO_UUID} From a65b6e6edb3e69d3c23d03810aa61907c4746dba Mon Sep 17 00:00:00 2001 From: Benitoite Date: Tue, 11 Feb 2020 06:52:27 -0800 Subject: [PATCH 4/7] Remove COMMAND_ECHO STDOUTs --- UpdateInfo.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake index 9aa211d96..1c31cf44f 100644 --- a/UpdateInfo.cmake +++ b/UpdateInfo.cmake @@ -64,10 +64,10 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) set(GIT_NUMERIC_VERSION_BS "${GIT_NUMERIC_VERSION_BS}.${GIT_COMMITS_SINCE_TAG}") endif() - execute_process(COMMAND uname -mrs COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_OS OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND date -Ru COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND date +%s COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_EPOCH OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND uuidgen COMMAND tr "A-Z" "a-z" COMMAND_ECHO STDOUT OUTPUT_VARIABLE BUILDINFO_UUID OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND uname -mrs OUTPUT_VARIABLE BUILDINFO_OS OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND date -Ru OUTPUT_VARIABLE BUILDINFO_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND date +%s OUTPUT_VARIABLE BUILDINFO_EPOCH OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND uuidgen COMMAND tr "A-Z" "a-z" OUTPUT_VARIABLE BUILDINFO_UUID OUTPUT_STRIP_TRAILING_WHITESPACE) message(STATUS "Git checkout information:") message(STATUS " Commit description: ${GIT_DESCRIBE}") From 2acf13a62a55d4b9c7fae29c9061ab8b242c6229 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Sat, 15 Feb 2020 15:37:42 -0800 Subject: [PATCH 5/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bab7397a6..d1f1578f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: CMAKE_CXX_STANDARD: 11 PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig RAW_THERAPEE_MAJOR: '5' - RAW_THERAPEE_MINOR: '7' + RAW_THERAPEE_MINOR: '8' C_FLAGS: -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include run: | # GITHUB_REF is the ref that triggered the build, like refs/heads/new-feature - the next line parses that to REF: the branch name only (new-feature) From 3041169499dc293e39dff4a5015d698640f7cc2c Mon Sep 17 00:00:00 2001 From: Benitoite Date: Mon, 17 Feb 2020 14:49:17 -0800 Subject: [PATCH 6/7] UpdateInfo.cmake: remove an errant whitespace --- UpdateInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake index 1c31cf44f..a4de8fe1a 100644 --- a/UpdateInfo.cmake +++ b/UpdateInfo.cmake @@ -63,7 +63,7 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) string(REGEX REPLACE "-.*" "" GIT_NUMERIC_VERSION_BS ${GIT_DESCRIBE}) set(GIT_NUMERIC_VERSION_BS "${GIT_NUMERIC_VERSION_BS}.${GIT_COMMITS_SINCE_TAG}") endif() - + execute_process(COMMAND uname -mrs OUTPUT_VARIABLE BUILDINFO_OS OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND date -Ru OUTPUT_VARIABLE BUILDINFO_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND date +%s OUTPUT_VARIABLE BUILDINFO_EPOCH OUTPUT_STRIP_TRAILING_WHITESPACE) From 2029bfdf14b0e25e4c202cba5e7f8b52e4cb9de5 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Mon, 17 Feb 2020 14:50:24 -0800 Subject: [PATCH 7/7] mac: revert the travis yml for this PR --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1f1578f8..bab7397a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: CMAKE_CXX_STANDARD: 11 PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig RAW_THERAPEE_MAJOR: '5' - RAW_THERAPEE_MINOR: '8' + RAW_THERAPEE_MINOR: '7' C_FLAGS: -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include run: | # GITHUB_REF is the ref that triggered the build, like refs/heads/new-feature - the next line parses that to REF: the branch name only (new-feature)