Commit 00bd6a271da813ca3a8f297ee37a337f8adb5ab6
1 parent
4bb3046f
Streamline Windows release process
Showing
3 changed files
with
30 additions
and
6 deletions
README-maintainer.md
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | cd /tmp | 50 | cd /tmp |
| 51 | zip -r qpdf-external-libs-src.zip external-libs | 51 | zip -r qpdf-external-libs-src.zip external-libs |
| 52 | ``` | 52 | ``` |
| 53 | -* 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. | 53 | +* 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. |
| 54 | * Before releasing, rebuild and test debian package. | 54 | * Before releasing, rebuild and test debian package. |
| 55 | * Remember to copy `README-what-to-download.md` separately onto the download area. | 55 | * Remember to copy `README-what-to-download.md` separately onto the download area. |
| 56 | * Remember to update the web page including putting new documentation in the `files` subdirectory of the website on sourceforge.net. | 56 | * Remember to update the web page including putting new documentation in the `files` subdirectory of the website on sourceforge.net. |
make_windows_releases
| @@ -11,6 +11,21 @@ else | @@ -11,6 +11,21 @@ else | ||
| 11 | wordsize=32 | 11 | wordsize=32 |
| 12 | fi | 12 | fi |
| 13 | 13 | ||
| 14 | +if [ "$wordsize" = 32 ]; then | ||
| 15 | + if [ ! -f win.64 ]; then | ||
| 16 | + echo "Waiting for win.64 to appear" | ||
| 17 | + while [ ! -f win.64 ]; do | ||
| 18 | + sleep 5 | ||
| 19 | + done | ||
| 20 | + fi | ||
| 21 | +else | ||
| 22 | + rm -f win.32 win.64 | ||
| 23 | + echo '' | ||
| 24 | + echo "You may now start $0 in a 32-bit window." | ||
| 25 | + echo '' | ||
| 26 | + sleep 5 | ||
| 27 | +fi | ||
| 28 | + | ||
| 14 | set -e | 29 | set -e |
| 15 | set -x | 30 | set -x |
| 16 | cwd=`pwd` | 31 | cwd=`pwd` |
| @@ -28,10 +43,16 @@ make -j8 | @@ -28,10 +43,16 @@ make -j8 | ||
| 28 | make check install | 43 | make check install |
| 29 | make distclean | 44 | make distclean |
| 30 | 45 | ||
| 46 | +touch win.$wordsize | ||
| 47 | + | ||
| 31 | set +x | 48 | set +x |
| 32 | 49 | ||
| 33 | -echo '' | ||
| 34 | -echo "Finished builds for $wordsize. If not done already, rerun this" | ||
| 35 | -echo "in a" `expr 96 - $wordsize` "environment." | ||
| 36 | -echo 'Then run "./make_windows_releases-finish".' | ||
| 37 | -echo '' | 50 | +echo "Finished builds for $wordsize." |
| 51 | + | ||
| 52 | +if [ "$wordsize" = 64 ]; then | ||
| 53 | + echo "If not done already, rerun this in a "`expr 96 - $wordsize`"-bit environment." | ||
| 54 | + echo '' | ||
| 55 | + echo 'Running "./make_windows_releases-finish".' | ||
| 56 | + echo '' | ||
| 57 | + ./make_windows_releases-finish | ||
| 58 | +fi |
make_windows_releases-finish