Skip to content

Commit 7a43018

Browse files
authored
v1.7.11 (#538)
* v1.7.11 * Remove client version workaround * Restore previous defining of CLIENT_VERSION * Remove BUILD_VERSION * Remove BUILD_VERSION from genbuild.sh
1 parent 3eb8b13 commit 7a43018

File tree

6 files changed

+11
-21
lines changed

6 files changed

+11
-21
lines changed

build_msvc/defi_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#define CLIENT_VERSION_MAJOR 1
1515

1616
/* Minor version */
17-
#define CLIENT_VERSION_MINOR 0
17+
#define CLIENT_VERSION_MINOR 7
1818

1919
/* Build revision */
20-
#define CLIENT_VERSION_REVISION 0
20+
#define CLIENT_VERSION_REVISION 11
2121

2222
/* Copyright holder(s) before %s replacement */
2323
#define COPYRIGHT_HOLDERS "The %s Developers"
@@ -29,7 +29,7 @@
2929
#define COPYRIGHT_HOLDERS_SUBSTITUTION "DeFi Blockchain"
3030

3131
/* Copyright year */
32-
#define COPYRIGHT_YEAR 2020
32+
#define COPYRIGHT_YEAR 2021
3333

3434
/* Define to 1 to enable wallet functions */
3535
#define ENABLE_WALLET 1

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 1)
44
define(_CLIENT_VERSION_MINOR, 7)
5-
define(_CLIENT_VERSION_REVISION, 10)
5+
define(_CLIENT_VERSION_REVISION, 11)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_RC, 0)
88
define(_CLIENT_VERSION_IS_RELEASE, true)

make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ docker_build() {
166166
echo "> building: ${img}"
167167
local docker_file="${dockerfiles_dir}/${target}.dockerfile"
168168
echo "> docker build: ${img}"
169-
docker build --build-arg BUILD_VERSION=${IMAGE_VERSION} -f "${docker_file}" -t "${img}" "${docker_context}"
169+
docker build -f "${docker_file}" -t "${img}" "${docker_context}"
170170
done
171171
}
172172

share/genbuild.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
3939
git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
4040
fi
4141

42-
if [ -n "$BUILD_VERSION" ]; then
43-
NEWINFO="#define BUILD_DESC \"$BUILD_VERSION\""
44-
elif [ -n "$DESC" ]; then
42+
if [ -n "$DESC" ]; then
4543
NEWINFO="#define BUILD_DESC \"$DESC\""
4644
elif [ -n "$SUFFIX" ]; then
4745
NEWINFO="#define BUILD_SUFFIX $SUFFIX"

src/clientversion.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,6 @@ std::string FormatFullVersion()
8686
return CLIENT_BUILD;
8787
}
8888

89-
int GetClientVersion()
90-
{
91-
// C++11 guarantees thread safe static initialization
92-
static const int version = []() {
93-
int major = 0, minor = 0, rev = 0;
94-
sscanf(BUILD_DESC, "v%d.%d.%d", &major, &minor, &rev);
95-
return major * 1000000 + minor * 10000 + rev * 100;
96-
}();
97-
return version;
98-
}
99-
10089
/**
10190
* Format the subversion field according to BIP 14 spec (https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki)
10291
*/

src/clientversion.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@
3535
#include <string>
3636
#include <vector>
3737

38-
#define CLIENT_VERSION GetClientVersion()
38+
static const int CLIENT_VERSION =
39+
1000000 * CLIENT_VERSION_MAJOR
40+
+ 10000 * CLIENT_VERSION_MINOR
41+
+ 100 * CLIENT_VERSION_REVISION
42+
+ 1 * CLIENT_VERSION_BUILD;
3943

4044
extern const std::string CLIENT_NAME;
4145
extern const std::string CLIENT_BUILD;
4246

43-
int GetClientVersion();
4447
std::string FormatFullVersion();
4548
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
4649

0 commit comments

Comments
 (0)