Skip to content

Commit 5100dee

Browse files
committed
clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE
Previously, building from a release source tarball would result in a version string like v22.0.0-<commithash>, but we expect just v22.0.0. This commit solves this problem. Also use PACKAGE_VERSION instead of reconstructing it.
1 parent e614cc8 commit 5100dee

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/clientversion.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ const std::string CLIENT_NAME("Satoshi");
3030
#define BUILD_DESC BUILD_GIT_TAG
3131
#define BUILD_SUFFIX ""
3232
#else
33-
#define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
34-
#ifdef BUILD_GIT_COMMIT
33+
#define BUILD_DESC "v" PACKAGE_VERSION
34+
#if CLIENT_VERSION_IS_RELEASE
35+
#define BUILD_SUFFIX ""
36+
#elif defined(BUILD_GIT_COMMIT)
3537
#define BUILD_SUFFIX "-" BUILD_GIT_COMMIT
3638
#elif defined(GIT_COMMIT_ID)
3739
#define BUILD_SUFFIX "-g" GIT_COMMIT_ID

0 commit comments

Comments
 (0)