diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2021-04-18 19:07:13 -0400 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2021-04-19 06:11:38 -0400 |
| commit | 615965cfd1ef1e0627d69970d99bdfedb9176833 (patch) | |
| tree | 49197eebf7afdb1d7a192e3b08bee414f493bc99 /src | |
| parent | 5bed2ab42c4f1a820468f7005ce62e39001f6611 (diff) | |
Move common package version code to init/common
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 9 | ||||
| -rw-r--r-- | src/init/common.cpp | 12 | ||||
| -rw-r--r-- | src/init/common.h | 1 |
3 files changed, 14 insertions, 8 deletions
diff --git a/src/init.cpp b/src/init.cpp index 35c989d4e9..4760d8c4ab 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -756,14 +756,7 @@ void InitParameterInteraction(ArgsManager& args) void InitLogging(const ArgsManager& args) { init::SetLoggingOptions(args); - - std::string version_string = FormatFullVersion(); -#ifdef DEBUG - version_string += " (debug build)"; -#else - version_string += " (release build)"; -#endif - LogPrintf(PACKAGE_NAME " version %s\n", version_string); + init::LogPackageVersion(); } namespace { // Variables internal to initialization process only diff --git a/src/init/common.cpp b/src/init/common.cpp index 35776080dc..79e0c9da78 100644 --- a/src/init/common.cpp +++ b/src/init/common.cpp @@ -6,6 +6,7 @@ #include <config/bitcoin-config.h> #endif +#include <clientversion.h> #include <compat/sanity.h> #include <crypto/sha256.h> #include <key.h> @@ -152,4 +153,15 @@ bool StartLogging(const ArgsManager& args) return true; } + +void LogPackageVersion() +{ + std::string version_string = FormatFullVersion(); +#ifdef DEBUG + version_string += " (debug build)"; +#else + version_string += " (release build)"; +#endif + LogPrintf(PACKAGE_NAME " version %s\n", version_string); +} } // namespace init diff --git a/src/init/common.h b/src/init/common.h index 91a7282d10..fc4bc1b280 100644 --- a/src/init/common.h +++ b/src/init/common.h @@ -22,6 +22,7 @@ void AddLoggingArgs(ArgsManager& args); void SetLoggingOptions(const ArgsManager& args); void SetLoggingCategories(const ArgsManager& args); bool StartLogging(const ArgsManager& args); +void LogPackageVersion(); } // namespace init #endif // BITCOIN_INIT_COMMON_H |