Skip to content

Commit b0c9024

Browse files
committed
Merge #20449: build: Fix Windows installer build
68c2ef1 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 68c2ef1 laanwj: Code review ACK 68c2ef1 hebasto: Approach ACK 68c2ef1, tested on Linux Mint 20 (x86_64, nsis 3.05-2). Tree-SHA512: 845560ff176eae8081096426790c928a773fa75d366f42a2a4631c1be2ae9234d7a5b72854ccfaa7fa1a32002b937ca393b12168ffacf9a5e3e311a76725483a
2 parents 86bf3ae + 68c2ef1 commit b0c9024

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

share/qt/Info.plist.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<string>APPL</string>
1818

1919
<key>NSHumanReadableCopyright</key>
20-
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
20+
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
2121

2222
<key>CFBundleShortVersionString</key>
2323
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string>

share/setup.nsi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ CRCCheck on
5656
XPStyle on
5757
BrandingText " "
5858
ShowInstDetails show
59-
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@
59+
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@.0
6060
VIAddVersionKey ProductName "@PACKAGE_NAME@"
6161
VIAddVersionKey ProductVersion "@PACKAGE_VERSION@"
6262
VIAddVersionKey CompanyName "${COMPANY}"

0 commit comments

Comments
 (0)