diff options
author | Jay Berkenbilt <ejb@ql.org> | 2018-02-21 15:05:34 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2018-02-21 15:05:34 +0100 |
commit | 30923669368970bb82a39143c9082d7a988175ef (patch) | |
tree | c19b3a9829415c85936f655d8668d607f46dd5c5 /make_windows_releases | |
parent | ca0d190812839687bc1a8c33966e43c3f6eb87c8 (diff) | |
download | qpdf-30923669368970bb82a39143c9082d7a988175ef.tar.zst |
make_windows_releases: build 32 bit first, build msvc first
Build in the order that is most likely to detect failures earlier.
Diffstat (limited to 'make_windows_releases')
-rwxr-xr-x | make_windows_releases | 17 |
1 files changed, 9 insertions, 8 deletions
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 |