diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..2464604e --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.0.0-rc0 diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 70b94333..30e695fc 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -16,8 +16,10 @@ EXECUTE_PROCESS(COMMAND OUTPUT_VARIABLE GIT_DATE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -MESSAGE(STATUS "Git SHA1: ${GIT_SHA1}") -MESSAGE(STATUS "Git date: ${GIT_DATE}") +FILE(STRINGS ../VERSION PACKAGE_VERSION) +MESSAGE(STATUS "Jungfraujoch git SHA1: ${GIT_SHA1}") +MESSAGE(STATUS "Jungfraujoch git date: ${GIT_DATE}") +MESSAGE(STATUS "Jungfraujoch version: ${PACKAGE_VERSION}") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GitInfo.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp" @ONLY) diff --git a/common/GitInfo.cpp.in b/common/GitInfo.cpp.in index ca5bf312..cee2983d 100644 --- a/common/GitInfo.cpp.in +++ b/common/GitInfo.cpp.in @@ -9,3 +9,7 @@ std::string jfjoch_git_sha1() { std::string jfjoch_git_date() { return "@GIT_DATE@"; } + +std::string jfjoch_version() { + return "@PACKAGE_VERSION@"; +} \ No newline at end of file diff --git a/common/GitInfo.h b/common/GitInfo.h index fc87481f..c6d941f6 100644 --- a/common/GitInfo.h +++ b/common/GitInfo.h @@ -7,5 +7,6 @@ std::string jfjoch_git_sha1(); std::string jfjoch_git_date(); +std::string jfjoch_version(); #endif //JUNGFRAUJOCH_GITINFO_H diff --git a/common/Logger.cpp b/common/Logger.cpp index b426da26..ff5ec7ee 100644 --- a/common/Logger.cpp +++ b/common/Logger.cpp @@ -16,7 +16,7 @@ Logger::Logger(const std::string &service_name, const std::string &file_name) { sinks.push_back(std::make_shared(file_name, 23, 59)); spdlog_logger = std::make_shared(service_name, std::begin(sinks), std::end(sinks)); - spdlog_logger->info("Git sha {} ({})", jfjoch_git_sha1().substr(0, 6), jfjoch_git_date()); + spdlog_logger->info("Version {} (git {} {})", jfjoch_version(), jfjoch_git_sha1().substr(0, 6), jfjoch_git_date()); } void Logger::ErrorException(const std::exception &e) {