diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-11-23 13:35:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-11-23 13:36:41 +0100 |
| commit | b0c9024a7cf62a5b8510e8aa5a52563f311d91b2 (patch) | |
| tree | 3e1d58353314a82b3da92f15b8f665f81646bffc /share | |
| parent | 86bf3ae3b57eea4361452d19e3e62c8847d23714 (diff) | |
| parent | 68c2ef13e953f142f818a84be9e2c09ef8636ccc (diff) | |
| download | bitcoin-b0c9024a7cf62a5b8510e8aa5a52563f311d91b2.tar.xz | |
Merge #20449: build: Fix Windows installer build
68c2ef13e953f142f818a84be9e2c09ef8636ccc Fix version string in Windows and Mac installers (Andrew Chow)
Pull request description:
Apparently NSIS requires a 4 digit version number, and #20223 dropped the 4th digit. So this adds a 4th 0 digit so that building the Windows installer doesn't fail. Also fixes a typo in that version string that was also present in a plist file.
ACKs for top commit:
fanquake:
ACK 68c2ef13e953f142f818a84be9e2c09ef8636ccc
laanwj:
Code review ACK 68c2ef13e953f142f818a84be9e2c09ef8636ccc
hebasto:
Approach ACK 68c2ef13e953f142f818a84be9e2c09ef8636ccc, tested on Linux Mint 20 (x86_64, nsis 3.05-2).
Tree-SHA512: 845560ff176eae8081096426790c928a773fa75d366f42a2a4631c1be2ae9234d7a5b72854ccfaa7fa1a32002b937ca393b12168ffacf9a5e3e311a76725483a
Diffstat (limited to 'share')
| -rw-r--r-- | share/qt/Info.plist.in | 2 | ||||
| -rw-r--r-- | share/setup.nsi.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 8c0eb22540..7e3b0d5eb0 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -17,7 +17,7 @@ <string>APPL</string> <key>NSHumanReadableCopyright</key> - <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string> + <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string> <key>CFBundleShortVersionString</key> <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string> diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 1c4dcf3842..681f243d04 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -56,7 +56,7 @@ CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@ +VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@.0 VIAddVersionKey ProductName "@PACKAGE_NAME@" VIAddVersionKey ProductVersion "@PACKAGE_VERSION@" VIAddVersionKey CompanyName "${COMPANY}" |