rel-builds: Directly deploy win installer to OUTDIR

This commit is contained in:
Carl Dong 2020-04-27 16:13:57 -04:00
parent fa791da02f
commit d256f91cb1
No known key found for this signature in database
GPG key ID: 0CC52153197991A5
2 changed files with 2 additions and 16 deletions

View file

@ -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

View file

@ -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