From 06a957a792fff4727fdd0c346cf0b788e87e374d Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 5 Aug 2024 00:44:57 +0200 Subject: [PATCH] chore: replace PRJ_ with DWARFS_ in version files --- CMakeLists.txt | 6 +++--- cmake/version.cmake | 34 +++++++++++++++++++++------------- src/dwarfs/history.cpp | 18 +++++++++--------- src/dwarfs/tool/tool.cpp | 6 +++--- src/dwarfs/writer/scanner.cpp | 2 +- src/dwarfs_main.cpp | 4 ++-- 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e59336d..45fb292c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -799,13 +799,13 @@ if(DWARFS_GIT_BUILD) endif() target_compile_definitions( - dwarfs_tool PRIVATE PRJ_BUILD_ID="${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SYSTEM}, ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" + dwarfs_tool PRIVATE DWARFS_BUILD_ID="${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SYSTEM}, ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) target_compile_definitions( dwarfs_common PRIVATE - PRJ_SYSTEM_ID="${CMAKE_SYSTEM} [${CMAKE_SYSTEM_PROCESSOR}]" - PRJ_COMPILER_ID="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" + DWARFS_SYSTEM_ID="${CMAKE_SYSTEM} [${CMAKE_SYSTEM_PROCESSOR}]" + DWARFS_COMPILER_ID="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) if(ENABLE_RICEPP) diff --git a/cmake/version.cmake b/cmake/version.cmake index e313ed0a..a0a65123 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -141,11 +141,16 @@ set(PRJ_VERSION_PATCH \"${PRJ_VERSION_PATCH}\") namespace dwarfs { -char const* PRJ_GIT_REV = \"${PRJ_GIT_REV}\"; -char const* PRJ_GIT_DATE = ${PRJ_GIT_DATE_VALUE}; -char const* PRJ_GIT_DESC = \"${PRJ_GIT_DESC}\"; -char const* PRJ_GIT_BRANCH = \"${PRJ_GIT_BRANCH}\"; -char const* PRJ_GIT_ID = \"${PRJ_GIT_ID}\"; +int get_dwarfs_library_version() +{ + return DWARFS_VERSION; +} + +char const* const DWARFS_GIT_REV = \"${PRJ_GIT_REV}\"; +char const* const DWARFS_GIT_DATE = ${PRJ_GIT_DATE_VALUE}; +char const* const DWARFS_GIT_DESC = \"${PRJ_GIT_DESC}\"; +char const* const DWARFS_GIT_BRANCH = \"${PRJ_GIT_BRANCH}\"; +char const* const DWARFS_GIT_ID = \"${PRJ_GIT_ID}\"; } // namespace dwarfs ") @@ -155,17 +160,20 @@ char const* PRJ_GIT_ID = \"${PRJ_GIT_ID}\"; #pragma once -#define PRJ_VERSION_MAJOR ${PRJ_VERSION_MAJOR} -#define PRJ_VERSION_MINOR ${PRJ_VERSION_MINOR} -#define PRJ_VERSION_PATCH ${PRJ_VERSION_PATCH} +#define DWARFS_VERSION_MAJOR ${PRJ_VERSION_MAJOR} +#define DWARFS_VERSION_MINOR ${PRJ_VERSION_MINOR} +#define DWARFS_VERSION_PATCH ${PRJ_VERSION_PATCH} +#define DWARFS_VERSION (DWARFS_VERSION_MAJOR * 10000 + DWARFS_VERSION_MINOR * 100 + DWARFS_VERSION_PATCH) namespace dwarfs { -extern char const* PRJ_GIT_REV; -extern char const* PRJ_GIT_DATE; -extern char const* PRJ_GIT_DESC; -extern char const* PRJ_GIT_BRANCH; -extern char const* PRJ_GIT_ID; +int get_dwarfs_library_version(); + +extern char const* const DWARFS_GIT_REV; +extern char const* const DWARFS_GIT_DATE; +extern char const* const DWARFS_GIT_DESC; +extern char const* const DWARFS_GIT_BRANCH; +extern char const* const DWARFS_GIT_ID; } // namespace dwarfs ") diff --git a/src/dwarfs/history.cpp b/src/dwarfs/history.cpp index a6e3a3d3..b8e9f353 100644 --- a/src/dwarfs/history.cpp +++ b/src/dwarfs/history.cpp @@ -57,15 +57,15 @@ void history::parse_append(std::span data) { void history::append(std::optional> args) { auto& histent = history_->entries()->emplace_back(); auto& version = histent.version().value(); - version.major() = PRJ_VERSION_MAJOR; - version.minor() = PRJ_VERSION_MINOR; - version.patch() = PRJ_VERSION_PATCH; - version.is_release() = std::string_view(PRJ_GIT_DESC) == PRJ_GIT_ID; - version.git_rev() = PRJ_GIT_REV; - version.git_branch() = PRJ_GIT_BRANCH; - version.git_desc() = PRJ_GIT_DESC; - histent.system_id() = PRJ_SYSTEM_ID; - histent.compiler_id() = PRJ_COMPILER_ID; + version.major() = DWARFS_VERSION_MAJOR; + version.minor() = DWARFS_VERSION_MINOR; + version.patch() = DWARFS_VERSION_PATCH; + version.is_release() = std::string_view(DWARFS_GIT_DESC) == DWARFS_GIT_ID; + version.git_rev() = DWARFS_GIT_REV; + version.git_branch() = DWARFS_GIT_BRANCH; + version.git_desc() = DWARFS_GIT_DESC; + histent.system_id() = DWARFS_SYSTEM_ID; + histent.compiler_id() = DWARFS_COMPILER_ID; if (args) { histent.arguments() = std::move(*args); } diff --git a/src/dwarfs/tool/tool.cpp b/src/dwarfs/tool/tool.cpp index bd221aab..e2027199 100644 --- a/src/dwarfs/tool/tool.cpp +++ b/src/dwarfs/tool/tool.cpp @@ -51,8 +51,8 @@ namespace dwarfs::tool { std::string tool_header(std::string_view tool_name, std::string_view extra_info) { std::string date; - if (PRJ_GIT_DATE) { - date = fmt::format(" [{}]", PRJ_GIT_DATE); + if (DWARFS_GIT_DATE) { + date = fmt::format(" [{}]", DWARFS_GIT_DATE); } return fmt::format( // clang-format off @@ -62,7 +62,7 @@ tool_header(std::string_view tool_name, std::string_view extra_info) { R"( |___/ \_/\_/\__,_|_| |_| |___/ by Marcus Holland-Moritz)""\n\n" // clang-format on "{} ({}{}{})\nbuilt for {}\n\n", - tool_name, PRJ_GIT_ID, date, extra_info, PRJ_BUILD_ID); + tool_name, DWARFS_GIT_ID, date, extra_info, DWARFS_BUILD_ID); } void add_common_options(po::options_description& opts, diff --git a/src/dwarfs/writer/scanner.cpp b/src/dwarfs/writer/scanner.cpp index f556c931..4cd889b1 100644 --- a/src/dwarfs/writer/scanner.cpp +++ b/src/dwarfs/writer/scanner.cpp @@ -966,7 +966,7 @@ void scanner_::scan( mv2.total_fs_size() = prog.original_size; mv2.total_hardlink_size() = prog.hardlink_size; mv2.options() = fsopts; - mv2.dwarfs_version() = std::string("libdwarfs ") + PRJ_GIT_ID; + mv2.dwarfs_version() = std::string("libdwarfs ") + DWARFS_GIT_ID; if (!options_.no_create_timestamp) { mv2.create_timestamp() = std::time(nullptr); } diff --git a/src/dwarfs_main.cpp b/src/dwarfs_main.cpp index f065164d..10360ff3 100644 --- a/src/dwarfs_main.cpp +++ b/src/dwarfs_main.cpp @@ -1621,8 +1621,8 @@ int dwarfs_main(int argc, sys_char** argv, iolayer const& iol) { LOG_PROXY(debug_logger_policy, userdata.lgr); - LOG_INFO << "dwarfs (" << PRJ_GIT_ID << ", fuse version " << FUSE_USE_VERSION - << ")"; + LOG_INFO << "dwarfs (" << DWARFS_GIT_ID << ", fuse version " + << FUSE_USE_VERSION << ")"; try { if (userdata.opts.logopts.threshold >= logger::DEBUG) {