TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-11 05:23:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace PRJ_ with DWARFS_ in version files

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-05 00:44:57 +02:00
parent 9f23c65381
commit 06a957a792
6 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -799,13 +799,13 @@ if(DWARFS_GIT_BUILD)
endif() endif()
target_compile_definitions( 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( target_compile_definitions(
dwarfs_common PRIVATE dwarfs_common PRIVATE
PRJ_SYSTEM_ID="${CMAKE_SYSTEM} [${CMAKE_SYSTEM_PROCESSOR}]" DWARFS_SYSTEM_ID="${CMAKE_SYSTEM} [${CMAKE_SYSTEM_PROCESSOR}]"
PRJ_COMPILER_ID="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" DWARFS_COMPILER_ID="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
) )
if(ENABLE_RICEPP) if(ENABLE_RICEPP)

34
cmake/version.cmake
View File

@ -141,11 +141,16 @@ set(PRJ_VERSION_PATCH \"${PRJ_VERSION_PATCH}\")
namespace dwarfs { namespace dwarfs {
char const* PRJ_GIT_REV = \"${PRJ_GIT_REV}\"; int get_dwarfs_library_version()
char const* PRJ_GIT_DATE = ${PRJ_GIT_DATE_VALUE}; {
char const* PRJ_GIT_DESC = \"${PRJ_GIT_DESC}\"; return DWARFS_VERSION;
char const* PRJ_GIT_BRANCH = \"${PRJ_GIT_BRANCH}\"; }
char const* PRJ_GIT_ID = \"${PRJ_GIT_ID}\";
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 } // namespace dwarfs
") ")
@ -155,17 +160,20 @@ char const* PRJ_GIT_ID = \"${PRJ_GIT_ID}\";
#pragma once #pragma once
#define PRJ_VERSION_MAJOR ${PRJ_VERSION_MAJOR} #define DWARFS_VERSION_MAJOR ${PRJ_VERSION_MAJOR}
#define PRJ_VERSION_MINOR ${PRJ_VERSION_MINOR} #define DWARFS_VERSION_MINOR ${PRJ_VERSION_MINOR}
#define PRJ_VERSION_PATCH ${PRJ_VERSION_PATCH} #define DWARFS_VERSION_PATCH ${PRJ_VERSION_PATCH}
#define DWARFS_VERSION (DWARFS_VERSION_MAJOR * 10000 + DWARFS_VERSION_MINOR * 100 + DWARFS_VERSION_PATCH)
namespace dwarfs { namespace dwarfs {
extern char const* PRJ_GIT_REV; int get_dwarfs_library_version();
extern char const* PRJ_GIT_DATE;
extern char const* PRJ_GIT_DESC; extern char const* const DWARFS_GIT_REV;
extern char const* PRJ_GIT_BRANCH; extern char const* const DWARFS_GIT_DATE;
extern char const* PRJ_GIT_ID; extern char const* const DWARFS_GIT_DESC;
extern char const* const DWARFS_GIT_BRANCH;
extern char const* const DWARFS_GIT_ID;
} // namespace dwarfs } // namespace dwarfs
") ")

18
src/dwarfs/history.cpp
View File

@ -57,15 +57,15 @@ void history::parse_append(std::span<uint8_t const> data) {
void history::append(std::optional<std::vector<std::string>> args) { void history::append(std::optional<std::vector<std::string>> args) {
auto& histent = history_->entries()->emplace_back(); auto& histent = history_->entries()->emplace_back();
auto& version = histent.version().value(); auto& version = histent.version().value();
version.major() = PRJ_VERSION_MAJOR; version.major() = DWARFS_VERSION_MAJOR;
version.minor() = PRJ_VERSION_MINOR; version.minor() = DWARFS_VERSION_MINOR;
version.patch() = PRJ_VERSION_PATCH; version.patch() = DWARFS_VERSION_PATCH;
version.is_release() = std::string_view(PRJ_GIT_DESC) == PRJ_GIT_ID; version.is_release() = std::string_view(DWARFS_GIT_DESC) == DWARFS_GIT_ID;
version.git_rev() = PRJ_GIT_REV; version.git_rev() = DWARFS_GIT_REV;
version.git_branch() = PRJ_GIT_BRANCH; version.git_branch() = DWARFS_GIT_BRANCH;
version.git_desc() = PRJ_GIT_DESC; version.git_desc() = DWARFS_GIT_DESC;
histent.system_id() = PRJ_SYSTEM_ID; histent.system_id() = DWARFS_SYSTEM_ID;
histent.compiler_id() = PRJ_COMPILER_ID; histent.compiler_id() = DWARFS_COMPILER_ID;
if (args) { if (args) {
histent.arguments() = std::move(*args); histent.arguments() = std::move(*args);
} }

6
src/dwarfs/tool/tool.cpp
View File

@ -51,8 +51,8 @@ namespace dwarfs::tool {
std::string std::string
tool_header(std::string_view tool_name, std::string_view extra_info) { tool_header(std::string_view tool_name, std::string_view extra_info) {
std::string date; std::string date;
if (PRJ_GIT_DATE) { if (DWARFS_GIT_DATE) {
date = fmt::format(" [{}]", PRJ_GIT_DATE); date = fmt::format(" [{}]", DWARFS_GIT_DATE);
} }
return fmt::format( return fmt::format(
// clang-format off // 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" R"( |___/ \_/\_/\__,_|_| |_| |___/ by Marcus Holland-Moritz)""\n\n"
// clang-format on // clang-format on
"{} ({}{}{})\nbuilt for {}\n\n", "{} ({}{}{})\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, void add_common_options(po::options_description& opts,

2
src/dwarfs/writer/scanner.cpp
View File

@ -966,7 +966,7 @@ void scanner_<LoggerPolicy>::scan(
mv2.total_fs_size() = prog.original_size; mv2.total_fs_size() = prog.original_size;
mv2.total_hardlink_size() = prog.hardlink_size; mv2.total_hardlink_size() = prog.hardlink_size;
mv2.options() = fsopts; 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) { if (!options_.no_create_timestamp) {
mv2.create_timestamp() = std::time(nullptr); mv2.create_timestamp() = std::time(nullptr);
} }

4
src/dwarfs_main.cpp
View File

@ -1621,8 +1621,8 @@ int dwarfs_main(int argc, sys_char** argv, iolayer const& iol) {
LOG_PROXY(debug_logger_policy, userdata.lgr); 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 { try {
if (userdata.opts.logopts.threshold >= logger::DEBUG) { if (userdata.opts.logopts.threshold >= logger::DEBUG) {