From d256f91cb1b0d6ff5170106b99b0266cbe51f5a2 Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Mon, 27 Apr 2020 16:13:57 -0400
Subject: rel-builds: Directly deploy win installer to OUTDIR

---
 contrib/gitian-descriptors/gitian-win.yml |  3 +--
 contrib/guix/libexec/build.sh             | 15 +--------------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'contrib')

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
 
-- 
cgit v1.2.3