gitian: Various improvements for Windows descriptor #17029

dongcarl commented at 8:31 PM on October 2, 2019: member

It would seem that our gitian-win.yml has not been keeping up with gitian-linux.yml, this PR:

Minimizes the diff size between gitian-{win,linux}.yml
Eliminates the rename dependency

gitian: Use split-debug.sh for Win builds

Debug splitting was first introduced in 7e7eb2724, then gitian-linux.yml
changed to using split-debug.sh in 9d2536208. Here we change
gitian-win.yml to use split-debug.sh as well.

93cb974980

dongcarl added the label Build system on Oct 2, 2019

dongcarl added the label Needs gitian build on Oct 2, 2019

DrahtBot removed the label Needs gitian build on Oct 3, 2019

jonasschnelli commented at 1:43 PM on October 3, 2019: contributor

utACK e1c60900d56cdc6a34da3e4556a759ce7185ce07 https://bitcoin.jonasschnelli.ch/build/1244

fanquake commented at 10:17 AM on October 4, 2019: member

Concept ACK

hebasto commented at 7:10 PM on October 6, 2019: member

Concept ACK

in contrib/gitian-descriptors/gitian-win.yml:169 in 503a067f10 outdated

 165 | @@ -166,6 +166,7 @@ script: |
 166 |      rm -rf ${DISTNAME}/lib/pkgconfig
 167 |      find ${DISTNAME}/bin -type f -executable -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
 168 |      find ${DISTNAME}/lib -type f -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
 169 | +    cp ../doc/README.md ${DISTNAME}/

MarcoFalke commented at 4:55 PM on October 7, 2019:

in commit 503a067f105cbfd249fd852a66569799e980f123:

why?

the doc readme has a ton of internal links, which are all dead (obviously) when shipped in the zip

dongcarl commented at 6:46 PM on October 7, 2019:

Should that be removed from the gitian-linux.yml as well?

MarcoFalke commented at 7:02 PM on October 7, 2019:

This has been added in 8550f1fb28292a081aab3f49ba2fb561710c4572 by @hebasto as a fix for #8160.

Though, I think that instead of ./doc/README.md, it should say ./README.md (at the root)

dongcarl commented at 7:09 PM on October 7, 2019:

Very true, ~~will fix for both.~~ fixed in ee69d9366cdf6387915ba8ae1e0bf23ae16b5009.

laanwj commented at 8:34 AM on October 8, 2019:

I agree that the current README's are pretty much completely useless to package with a binary distribution (as they're directed at developers and contributors, not users). I don't think #8160 ever really was solved.

Note that for Windows specifically there is doc/README_windows.txt as user documentation meant to be copied to the distributions as readme.txt (.md files are inconvenient to open on Windows, as well as the line endings differ). The NSI installer does this, but the descriptor for the ~~tar~~zipball doesn't.

dongcarl commented at 3:17 PM on October 8, 2019:

@laanwj should I do

cp ../doc/README_windows.txt ${DISTNAME}/readme.txt

instead?

laanwj commented at 5:30 PM on October 8, 2019:

yes, that's what i'd suggest, it's the most appropriate file for this

gitian: Fix README inclusion in archives

Linux:
The README was originally added in 8550f1fb2, but included the README
under the docs directory, which has a bunch of internal links that won't
make sense in a release tarball. In this patch, we include the root
level README instead, which makes more sense.

Windows:
.md files are inconvenient to open on windows and the line endings
differ, so we use README_windows.txt instead.

c4a3c25ba1

gitian: Smaller diff with gitian-linux.yml 999a9a5f5b

gitian: Eliminate rename dependency 71949a97a7

gitian: Put things in the right place to begin with 9d1f971c75

dongcarl force-pushed on Oct 8, 2019

dongcarl commented at 5:40 PM on October 8, 2019: member

Addressed all comments.

MarcoFalke commented at 5:48 PM on October 8, 2019: member

See also #17077 (slightly related)

hebasto commented at 5:58 PM on October 8, 2019: member

See also #17077 (slightly related)

Yes. The question (#17077) arose while reviewing this PR ;)

MarcoFalke deleted a comment on Oct 8, 2019

MarcoFalke added the label Needs gitian build on Oct 8, 2019

dongcarl commented at 6:01 PM on October 8, 2019: member

I know I'm kinda asking for it because of naming of the PR, but could we resolve #17077 in another PR? :grimacing:

DrahtBot commented at 5:10 AM on October 9, 2019: member

Gitian builds for commit e173d587e1c2391f774d08f28b7337cbe4ffcbe5 (master):

df9f8a91097969f43aaf0c6f79823e28... bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz
ef47b9b3a4fbb6cfe503c20bcb59b5e0... bitcoin-0.19.99-aarch64-linux-gnu.tar.gz
f07824c96f4ce87bf0accff14942323d... bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz
bde497fc6c3b54209366c54e3eb67f64... bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz
ffb92a4b521783ff33474ebe55a0fffd... bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz
2eaded40a7d4966f9518492ef3d5b312... bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz
794b20fe8d638bc311a3ef4c90b2b657... bitcoin-0.19.99-osx-unsigned.dmg
36b0e3bc2fdca049554a79383bc9ceae... bitcoin-0.19.99-osx64.tar.gz
5b8b2f9ad8b8b60061d09158408806f6... bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz
3d55b353edb704c116c08974be4a3fd5... bitcoin-0.19.99-riscv64-linux-gnu.tar.gz
cc557c3529383bb19cf52be53190bf8c... bitcoin-0.19.99-win64-debug.zip
192d1608be37d37dd3e85413b72206d8... bitcoin-0.19.99-win64-setup-unsigned.exe
2f948db54daa609f2ae0947cdcad8af4... bitcoin-0.19.99-win64.zip
ac778199e999f779c68f17a4c28e9f3d... bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz
85d0c2d2414956ed3eef5c67dc39e1ee... bitcoin-0.19.99-x86_64-linux-gnu.tar.gz
221b4d6430b0fff3347a9366a2f1e382... bitcoin-0.19.99.tar.gz
1864ac1f442a2db23dbe276ca0aaf0f6... bitcoin-core-linux-0.20-res.yml
f34cdbec82930fbf104418e43c73bec0... bitcoin-core-osx-0.20-res.yml
05ccd3ad932ce16450c8b90153dc9458... bitcoin-core-win-0.20-res.yml
7103fe01836ddc23facc5d88ff9d3483... linux-build.log
5a70f37b22ec9c76e53fbc5e9d7f5fe7... osx-build.log
c67c6fd7feeb1b86bcff6e0bb409f507... win-build.log

Gitian builds for commit 531a3dc2206a80564b2a4bbb4865ae8066e9a0ca (master and this pull):

7a34d8c65ae4ce793647a48e169bdf1b... bitcoin-0.19.99-osx-unsigned.dmg
a6367b0264e222b3f1459be473900476... bitcoin-0.19.99-osx64.tar.gz
3dd4459fc5c2990a9760610010d1700f... bitcoin-0.19.99-win64-debug.zip
59c4040e5e1397de18e65dfd1ac71e15... bitcoin-0.19.99-win64-setup-unsigned.exe
dc8ad90fcf251862528d42dd9f77ac78... bitcoin-0.19.99-win64.zip
a1396033508e16c2ef22a0f6a1245074... bitcoin-0.19.99.tar.gz
2c32b9312d99ad22fd2582770d11e3e7... bitcoin-core-osx-0.20-res.yml
d783a3fe8ae473dcce3a4d710867d220... bitcoin-core-osx-0.20-res.yml.diff
6c87b42dd3af238a839452596b9d62ea... bitcoin-core-win-0.20-res.yml
5cb7e44663d7826a314a14e0c31bf255... bitcoin-core-win-0.20-res.yml.diff
285c699afca7dd0ca4f85dc31e689dd8... linux-build.log
38c900bca9227443e06cc60663e6f134... linux-build.log.diff
18ad34ee83a51285af1c876a7f56b8eb... osx-build.log
158bf03ab9e440ba203950f225c66e45... osx-build.log.diff
b1aef5d68ee3fd8977be2619163c5d09... win-build.log
f470b72198db8c93edebf63037003301... win-build.log.diff

DrahtBot removed the label Needs gitian build on Oct 9, 2019

laanwj commented at 7:36 AM on October 9, 2019: member

I think that can very well be addressed separately. It's not good to have a PR that keeps increasing in scope.

ACK 9d1f971c7554bd5eb80792a1b9a692e0145ed516

laanwj referenced this in commit 9b4dfec831 on Oct 9, 2019

laanwj merged this on Oct 9, 2019

laanwj closed this on Oct 9, 2019

in contrib/gitian-descriptors/gitian-win.yml:159 in 9d1f971c75

 152 | @@ -157,24 +153,27 @@ script: |
 153 |      make ${MAKEOPTS} -C src check-security
 154 |      make deploy
 155 |      make install DESTDIR=${INSTALLPATH}
 156 | -    rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
 157 | -    cp -f bitcoin-*setup*.exe $OUTDIR/
 158 | +    (
 159 | +      SETUP_EXE="$(basename "$(echo ./*-setup.exe)")"
 160 | +      cp -f "$SETUP_EXE" "${OUTDIR}/${SETUP_EXE/%-setup.exe/-setup-unsigned.exe}"
 161 | +    )

MarcoFalke commented at 8:27 PM on October 9, 2019:

Any thoughts on removing this?

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index d5f2c1ad35..2d613fca9d 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -153,10 +153,6 @@ script: |
     make ${MAKEOPTS} -C src check-security
     make deploy
     make install DESTDIR=${INSTALLPATH}
-    (
-      SETUP_EXE="$(basename "$(echo ./*-setup.exe)")"
-      cp -f "$SETUP_EXE" "${OUTDIR}/${SETUP_EXE/%-setup.exe/-setup-unsigned.exe}"
-    )
     cd installed
     mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
     find . -name "lib*.la" -delete
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index e9aa1f2b73..649483c732 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -48,7 +48,7 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile [@abs](/bitcoin-bitcoin/contributor/abs/)_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@WINDOWS_BITS@-setup.exe
+OutFile [@abs](/bitcoin-bitcoin/contributor/abs/)_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@WINDOWS_BITS@-setup-unsigned.exe
 !if "@WINDOWS_BITS@" == "64"
 InstallDir $PROGRAMFILES64\Bitcoin
 !else

laanwj referenced this in commit feb1a8c03a on Oct 31, 2019

sidhujag referenced this in commit 23d6ae497c on Oct 31, 2019

MarkLTZ referenced this in commit d20bd71bcf on Apr 10, 2020

sidhujag referenced this in commit 286414d811 on Nov 10, 2020

random-zebra referenced this in commit 3614de632e on Jul 19, 2021

UdjinM6 referenced this in commit 04640b8c05 on Oct 23, 2021

UdjinM6 referenced this in commit 60c1238ad7 on Oct 23, 2021

UdjinM6 referenced this in commit 8d1b4b7832 on Oct 23, 2021

UdjinM6 referenced this in commit 56057a27e5 on Dec 4, 2021

UdjinM6 referenced this in commit 824d6c08f9 on Dec 4, 2021

UdjinM6 referenced this in commit 632c759352 on Dec 5, 2021

DrahtBot locked this on Dec 16, 2021