Skip to content

Commit a4d4c96

Browse files
committed
Merge #1579: Prepare 29.4.1-rc1
934a087 generate elements man pages. Bump version to 29.4.1-rc1. Set correct copyright logic for cmake. (Tom Trevethan) Pull request description: Set correct copyright string logic for cmake man pages. Generate elements man pages. Bump version to 29.4.1-rc1. ACKs for top commit: delta1: ACK 934a087; tested locally Tree-SHA512: 8bfd83d968bc6ca768cfa8d48da83ff9e01e0049647331b72e70df1b908f1bbcb39274228b602bc91ff7d994de755906847dc16e82164556e3d7bd7d7adb3f07
2 parents 23b3fc1 + 934a087 commit a4d4c96

14 files changed

Lines changed: 3151 additions & 2293 deletions

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ get_directory_property(precious_variables CACHE_VARIABLES)
2929
set(CLIENT_NAME "Elements Core")
3030
set(CLIENT_VERSION_MAJOR 29)
3131
set(CLIENT_VERSION_MINOR 4)
32-
set(CLIENT_VERSION_BUILD 0)
32+
set(CLIENT_VERSION_BUILD 1)
3333
set(CLIENT_VERSION_RC 1)
3434
set(CLIENT_VERSION_IS_RELEASE "true")
35-
set(COPYRIGHT_YEAR "2025")
35+
set(COPYRIGHT_YEAR "2026")
3636

3737
# During the enabling of the CXX and CXXOBJ languages, we modify
3838
# CMake's compiler/linker invocation strings by appending the content
@@ -63,7 +63,8 @@ if(CLIENT_VERSION_RC GREATER 0)
6363
endif()
6464

6565
set(COPYRIGHT_HOLDERS "The %s developers")
66-
set(COPYRIGHT_HOLDERS_FINAL "The Elements Project developers")
66+
set(COPYRIGHT_HOLDERS_SUBSTITUTION "Elements Project")
67+
string(REPLACE "%s" "${COPYRIGHT_HOLDERS_SUBSTITUTION}" COPYRIGHT_HOLDERS_FINAL "${COPYRIGHT_HOLDERS}")
6768
set(CLIENT_BUGREPORT "https://github.com/ElementsProject/elements/issues")
6869

6970
#=============================

cmake/bitcoin-build-config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define COPYRIGHT_HOLDERS_FINAL "@COPYRIGHT_HOLDERS_FINAL@"
2525

2626
/* Replacement for %s in copyright holders string */
27-
#define COPYRIGHT_HOLDERS_SUBSTITUTION "@CLIENT_NAME@"
27+
#define COPYRIGHT_HOLDERS_SUBSTITUTION "@COPYRIGHT_HOLDERS_SUBSTITUTION@"
2828

2929
/* Copyright year */
3030
#define COPYRIGHT_YEAR @COPYRIGHT_YEAR@

doc/man/bitcoin-cli.1

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)