build: Fix Windows installer build#20449
Merged
laanwj merged 1 commit intobitcoin:masterfrom Nov 23, 2020
Merged
Conversation
Fixes some typos that cause gitian to fail to make the installers.
Member
Author
|
Member
|
ACK 68c2ef1
There's no mention in the docs, but for reference here is the build failure: STRIPPROG="/home/ubuntu/wrapped/x86_64-w64-mingw32-strip" /bin/bash /home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32/build-aux/install-sh -c -s ./src/bitcoin-wallet.exe ./release
Error: invalid VIProductVersion format, should be X.X.X.X
Error - aborting creation process
error: could not build /home/ubuntu/out/bitcoin-e9a1c9fbdea9-win64-setup-unsigned.exe
built /home/ubuntu/out/bitcoin-e9a1c9fbdea9-win64-setup-unsigned.exe
+ make install DESTDIR=/home/ubuntu/build/bitcoin/distsrc-x86_64-w64-mingw32/installed/bitcoin-e9a1c9fbdea9Seems a bit arbitrary that they'd enforce 4 digit version numbers. Also checked that the broken macOS version is fixed. i.e master is currently: Looks deterministic to me: Generating report
d03d8552ac2aa67cf6a5fe414a659d63e9f4441a20be54545b6f78bafeb47c07 bitcoin-68c2ef13e953-win-unsigned.tar.gz
6fe15d137e9310fc25ccc86d10c6de3e35f34196153df020cb9843731b56f75d bitcoin-68c2ef13e953-win64-debug.zip
c751fc2c0ce46324d988faaf5f1c98da0f66e96665ed6f7912a6ee1c6f641aba bitcoin-68c2ef13e953-win64-setup-unsigned.exe
d55f40434f180ed462ff803787cc781c4700b6187b022449d99839ff16b86b06 bitcoin-68c2ef13e953-win64.zip
a9cdd730e924267ffcab275e02482221fb336a792747d518d207a8298983c0a1 src/bitcoin-68c2ef13e953.tar.gz
d55e10bc81e5fb89a1252633475c770e206cc38fb117bd8154d5aec57502c239 bitcoin-core-win-22-res.yml
Done. |
hebasto
requested changes
Nov 23, 2020
Member
hebasto
left a comment
hebasto
left a comment
There was a problem hiding this comment.
Approach ACK 68c2ef1, tested on Linux Mint 20 (x86_64, nsis 3.05-2).
While the share/setup.nsi.in is touched, maybe add the Unicode True line to fix the warning:
...
/bin/mkdir -p ./release
STRIPPROG="/usr/bin/x86_64-w64-mingw32-strip" /bin/bash /home/hebasto/GitHub/bitcoin/build-aux/install-sh -c -s ./src/bitcoind.exe ./release
STRIPPROG="/usr/bin/x86_64-w64-mingw32-strip" /bin/bash /home/hebasto/GitHub/bitcoin/build-aux/install-sh -c -s ./src/qt/bitcoin-qt.exe ./release
STRIPPROG="/usr/bin/x86_64-w64-mingw32-strip" /bin/bash /home/hebasto/GitHub/bitcoin/build-aux/install-sh -c -s ./src/bitcoin-cli.exe ./release
STRIPPROG="/usr/bin/x86_64-w64-mingw32-strip" /bin/bash /home/hebasto/GitHub/bitcoin/build-aux/install-sh -c -s ./src/bitcoin-tx.exe ./release
STRIPPROG="/usr/bin/x86_64-w64-mingw32-strip" /bin/bash /home/hebasto/GitHub/bitcoin/build-aux/install-sh -c -s ./src/bitcoin-wallet.exe ./release
warning 7998: ANSI targets are deprecated
1 warning:
7998: ANSI targets are deprecated
built bitcoin-21.99.0-win64-setup.exe
Member
Member
IIRC it's a windows thing in how version numbers are represented in the record in question, not so much a NSIS thing. Code review ACK 68c2ef1 |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 23, 2020
68c2ef1 Fix version string in Windows and Mac installers (Andrew Chow) Pull request description: Apparently NSIS requires a 4 digit version number, and bitcoin#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
luke-jr
pushed a commit
to bitcoinknots/bitcoin
that referenced
this pull request
Dec 14, 2021
Fixes some typos that cause gitian to fail to make the installers. Github-Pull: bitcoin#20449 Rebased-From: 68c2ef1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.