diff options
| author | Carl Dong <contact@carldong.me> | 2020-04-27 16:13:57 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-05-01 12:30:20 -0400 |
| commit | d256f91cb1b0d6ff5170106b99b0266cbe51f5a2 (patch) | |
| tree | 9189bab35cdc370d0a19f3c427a86a56f0080b43 /contrib | |
| parent | fa791da02f9684e3fd554b687fb692ae6a23d65a (diff) | |
rel-builds: Directly deploy win installer to OUTDIR
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win.yml | 3 | ||||
| -rw-r--r-- | contrib/guix/libexec/build.sh | 15 |
2 files changed, 2 insertions, 16 deletions
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index adad7c32d1..d05b6d426d 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -133,9 +133,8 @@ script: | make ${MAKEOPTS} make ${MAKEOPTS} -C src check-security make ${MAKEOPTS} -C src check-symbols - make deploy + make deploy BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe" make install DESTDIR=${INSTALLPATH} - cp -f ./bitcoin-*-win64-setup-unsigned.exe ${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 864db48915..01f4518c73 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -220,7 +220,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" # Make the os-specific installers case "$HOST" in *mingw*) - make deploy ${V:+V=1} + make deploy ${V:+V=1} BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe" ;; esac @@ -232,19 +232,6 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" # Install built Bitcoin Core to $INSTALLPATH make install DESTDIR="${INSTALLPATH}" ${V:+V=1} - case "$HOST" in - *mingw*) - # This step not only moves the unsigned NSIS executable to - # "${OUTDIR}", but also renames it - # - # from: - # bitcoin-@PACKAGE_VERSION@-win64-setup-unsigned.exe - # to: - # ${DISTNAME}-win64-setup-unsigned.exe - # - cp -f ./bitcoin-*-win64-setup-unsigned.exe "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe" - ;; - esac ( cd installed |