aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README-maintainer.md2
-rwxr-xr-xmake_windows_releases17
2 files changed, 10 insertions, 9 deletions
diff --git a/README-maintainer.md b/README-maintainer.md
index 98ee2ecc..29e5166e 100644
--- a/README-maintainer.md
+++ b/README-maintainer.md
@@ -60,7 +60,7 @@ Example:
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 simultaneously in 32-bit and 64-windows 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. It may be necessary to disable antivirus software first.
* 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 2cd7afd2..8bff5224 100755
--- a/make_windows_releases
+++ b/make_windows_releases
@@ -11,17 +11,17 @@ 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
+if [ "$wordsize" = 64 ]; then
+ if [ ! -f win.32 ]; then
+ echo "Waiting for win.32 to appear"
+ while [ ! -f win.32 ]; 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 "You may now start $0 in a 64-bit window."
echo ''
sleep 5
fi
@@ -33,12 +33,12 @@ PATH=$cwd/libqpdf/build:$PATH
rm -rf install-mingw$wordsize install-msvc$wordsize
-./config-mingw
+./config-msvc
make -j8
make check install
make distclean
-./config-msvc
+./config-mingw
make -j8
make check install
make distclean
@@ -49,9 +49,10 @@ set +x
echo "Finished builds for $wordsize."
-if [ "$wordsize" = 64 ]; then
+if [ "$wordsize" = 32 ]; then
echo "If not done already, rerun this in a "`expr 96 - $wordsize`"-bit environment."
echo ''
+else
echo 'Running "./make_windows_releases-finish".'
echo ''
./make_windows_releases-finish