From 3991d7b53423cbfa74516108c15f7227f0a9a3ee Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 23 Dec 2023 10:23:40 -0800 Subject: [PATCH] fix Revision.cc generation --- CMakeLists.txt | 12 +++++++++++- src/Revision-generate.sh | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28461009..00756942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,13 +40,23 @@ find_package(resource_file QUIET) # Git metadata -add_custom_target(newserv-Revision-cc ALL COMMAND ./Revision-generate.sh WORKING_DIRECTORY src) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/Revision.cc ${CMAKE_CURRENT_BINARY_DIR}/src/__Revision__.cc + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/src/Revision-generate.sh ${CMAKE_CURRENT_BINARY_DIR}/src/Revision.cc + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src +) +add_custom_target( + newserv-Revision-cc + ALL + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/src/Revision.cc ${CMAKE_CURRENT_BINARY_DIR}/src/__Revision__.cc +) # Executable definition set(SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/src/Revision.cc src/AFSArchive.cc src/BattleParamsIndex.cc src/BMLArchive.cc diff --git a/src/Revision-generate.sh b/src/Revision-generate.sh index 1181527b..a79875f1 100755 --- a/src/Revision-generate.sh +++ b/src/Revision-generate.sh @@ -1,5 +1,7 @@ #!/bin/sh +OUTPUT_FILENAME="$1" + GIT_REVISION_HASH=$(git rev-parse --short HEAD) TIMESTAMP_SECS=$(date +%s) @@ -11,7 +13,7 @@ else fi fi -cat > Revision.cc < $OUTPUT_FILENAME <