From f6407ab38a2866a29a5c5a59ba720f2c1c0f353b Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Tue, 21 Jan 2025 01:57:39 -0600 Subject: [PATCH 1/2] Fixed typo in comment --- fcl/services/messages_icarus.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcl/services/messages_icarus.fcl b/fcl/services/messages_icarus.fcl index 94955ea..b77d028 100644 --- a/fcl/services/messages_icarus.fcl +++ b/fcl/services/messages_icarus.fcl @@ -63,7 +63,7 @@ message_debugfile_icarus: { message_infofile_icarus: { # - # message destination: all debug messages to a file + # message destination: all info messages to a file # type: "file" filename: "messages.log" From 6a0972b5b994377049f7ecfff326572c662299f0 Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Tue, 21 Jan 2025 01:59:53 -0600 Subject: [PATCH 2/2] SBN job metadata: icarusalg GIT version --- CMakeLists.txt | 1 + icarusalg/CMakeLists.txt | 1 + icarusalg/Metadata/CMakeLists.txt | 13 +++++++++++++ icarusalg/Metadata/GITrepoVersion.cxx.in | 16 ++++++++++++++++ icarusalg/Metadata/GITrepoVersion.h.in | 18 ++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 icarusalg/Metadata/CMakeLists.txt create mode 100644 icarusalg/Metadata/GITrepoVersion.cxx.in create mode 100644 icarusalg/Metadata/GITrepoVersion.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 46ebbf2..5103869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ find_package( Microsoft.GSL HINTS $ENV{GUIDELINE_SL_DIR} REQUIRED EXPORT ) include(ArtDictionary) include(CetMake) include(BasicPlugin) +include(SBNutils) # ADD SOURCE CODE SUBDIRECTORIES HERE add_subdirectory(icarusalg) diff --git a/icarusalg/CMakeLists.txt b/icarusalg/CMakeLists.txt index 8b6e578..3b57ef4 100644 --- a/icarusalg/CMakeLists.txt +++ b/icarusalg/CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(gallery) add_subdirectory(Geometry) add_subdirectory(PMT) add_subdirectory(Utilities) +add_subdirectory(Metadata) diff --git a/icarusalg/Metadata/CMakeLists.txt b/icarusalg/Metadata/CMakeLists.txt new file mode 100644 index 0000000..93ab625 --- /dev/null +++ b/icarusalg/Metadata/CMakeLists.txt @@ -0,0 +1,13 @@ +GenerateRepoVersionSource(${CMAKE_PROJECT_NAME}) + +message(DEBUG "Generated source file '${${CMAKE_PROJECT_NAME}_GIT_REPO_VERSION_SOURCE}.h'") + +cet_make_library( + SOURCE + "${${CMAKE_PROJECT_NAME}_GIT_REPO_VERSION_SOURCE}.h" + "${${CMAKE_PROJECT_NAME}_GIT_REPO_VERSION_SOURCE}.cxx" + ) + +install_headers(LIST "${CMAKE_CURRENT_BINARY_DIR}/${${CMAKE_PROJECT_NAME}_GIT_REPO_VERSION_SOURCE}.h") +install_source(LIST "${CMAKE_CURRENT_BINARY_DIR}/${${CMAKE_PROJECT_NAME}_GIT_REPO_VERSION_SOURCE}.cxx") + diff --git a/icarusalg/Metadata/GITrepoVersion.cxx.in b/icarusalg/Metadata/GITrepoVersion.cxx.in new file mode 100644 index 0000000..0d2a351 --- /dev/null +++ b/icarusalg/Metadata/GITrepoVersion.cxx.in @@ -0,0 +1,16 @@ +/** + * @file ${gitRepoVersionSourceStem}.cxx + * @brief GIT version for repository `${gitRepoName}`. + * @author automatically generated; + * template: Gianluca Petrillo (petrillo@slac.stanford.edu) + * @date January 18, 2025 + * @see ${gitRepoVersionSourceStem}.h + */ + +#include "${gitRepoVersionSourceStem}.h" + +// ----------------------------------------------------------------------------- +const char RepositoryVersion_${gitRepoName}[] = "${gitRepoVersion}"; + + +// ----------------------------------------------------------------------------- diff --git a/icarusalg/Metadata/GITrepoVersion.h.in b/icarusalg/Metadata/GITrepoVersion.h.in new file mode 100644 index 0000000..a321070 --- /dev/null +++ b/icarusalg/Metadata/GITrepoVersion.h.in @@ -0,0 +1,18 @@ +/** + * @file ${gitRepoVersionSourceStem}.h + * @brief GIT version for repository `${gitRepoName}`. + * @author automatically generated; + * template: Gianluca Petrillo (petrillo@slac.stanford.edu) + * @date January 18, 2025 + * @see ${gitRepoVersionSourceStem}.cxx + */ + +#ifndef ${gitRepoName}_${gitRepoVersionSourceStem}_H +#define ${gitRepoName}_${gitRepoVersionSourceStem}_H + + +/// Repository version for ${gitRepoName}. +extern const char RepositoryVersion_${gitRepoName}[]; + + +#endif // ${gitRepoName}_${gitRepoVersionSourceStem}_H