From 00bd6a271da813ca3a8f297ee37a337f8adb5ab6 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 18 Feb 2018 20:57:19 -0500
Subject: [PATCH] Streamline Windows release process

---
 README-maintainer.md         |  2 +-
 make_windows_releases        | 31 ++++++++++++++++++++++++++-----
 make_windows_releases-finish |  3 +++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/README-maintainer.md b/README-maintainer.md
index 3d57cf8f..435a1800 100644
--- a/README-maintainer.md
+++ b/README-maintainer.md
@@ -50,7 +50,7 @@
   cd /tmp
   zip -r qpdf-external-libs-src.zip external-libs
   ```
-* To create Windows binary releases, extract the qpdf source distribution in Windows (MSYS2 + MSVC).  From the extracted directory, extract the binary distribution of the external libraries.  Run ./make_windows_releases from there.
+* To create Windows binary releases, extract the qpdf source distribution in Windows (MSYS2 + MSVC).  From the extracted directory, extract the binary distribution of the external libraries.  Run ./make_windows_releases simultaneously in 32-bit and 64-windows from there.
 * Before releasing, rebuild and test debian package.
 * Remember to copy `README-what-to-download.md` separately onto the download area.
 * Remember to update the web page including putting new documentation in the `files` subdirectory of the website on sourceforge.net.
diff --git a/make_windows_releases b/make_windows_releases
index 2b7dd78c..2cd7afd2 100755
--- a/make_windows_releases
+++ b/make_windows_releases
@@ -11,6 +11,21 @@ else
     wordsize=32
 fi
 
+if [ "$wordsize" = 32 ]; then
+    if [ ! -f win.64 ]; then
+        echo "Waiting for win.64 to appear"
+        while [ ! -f win.64 ]; do
+            sleep 5
+        done
+    fi
+else
+    rm -f win.32 win.64
+    echo ''
+    echo "You may now start $0 in a 32-bit window."
+    echo ''
+    sleep 5
+fi
+
 set -e
 set -x
 cwd=`pwd`
@@ -28,10 +43,16 @@ make -j8
 make check install
 make distclean
 
+touch win.$wordsize
+
 set +x
 
-echo ''
-echo "Finished builds for $wordsize. If not done already, rerun this"
-echo "in a" `expr 96 - $wordsize` "environment."
-echo 'Then run "./make_windows_releases-finish".'
-echo ''
+echo "Finished builds for $wordsize."
+
+if [ "$wordsize" = 64 ]; then
+  echo "If not done already, rerun this in a "`expr 96 - $wordsize`"-bit environment."
+  echo ''
+  echo 'Running "./make_windows_releases-finish".'
+  echo ''
+  ./make_windows_releases-finish
+fi
diff --git a/make_windows_releases-finish b/make_windows_releases-finish
index 3ab5867d..536bfa83 100755
--- a/make_windows_releases-finish
+++ b/make_windows_releases-finish
@@ -4,6 +4,9 @@ if [ ! -d external-libs ]; then
    exit 2
 fi
 
+echo "Waiting for win.32 and win.64"
+while [ ! -f win.32 ] || [ ! -f win.64 ]; do sleep 1; done
+
 set -e
 set -x
 cwd=`pwd`