OpenSystemsDevelopment / qpdf

Commit 30923669368970bb82a39143c9082d7a988175ef

Authored by Jay Berkenbilt
1 parent ca0d1908

make_windows_releases: build 32 bit first, build msvc first 

Build in the order that is most likely to detect failures earlier.
Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
README-maintainer.md
  View file @3092366
... ... @@ -60,7 +60,7 @@ Example:
60 60 cd /tmp
61 61 zip -r qpdf-external-libs-src.zip external-libs
62 62 ```
63   -* 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.
  63 +* 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.
64 64 * Before releasing, rebuild and test debian package.
65 65 * Remember to copy `README-what-to-download.md` separately onto the download area.
66 66 * Remember to update the web page including putting new documentation in the `files` subdirectory of the website on sourceforge.net.
... ...
make_windows_releases
  View file @3092366
... ... @@ -11,17 +11,17 @@ else
11 11 wordsize=32
12 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
  14 +if [ "$wordsize" = 64 ]; then
  15 + if [ ! -f win.32 ]; then
  16 + echo "Waiting for win.32 to appear"
  17 + while [ ! -f win.32 ]; do
18 18 sleep 5
19 19 done
20 20 fi
21 21 else
22 22 rm -f win.32 win.64
23 23 echo ''
24   - echo "You may now start $0 in a 32-bit window."
  24 + echo "You may now start $0 in a 64-bit window."
25 25 echo ''
26 26 sleep 5
27 27 fi
... ... @@ -33,12 +33,12 @@ PATH=$cwd/libqpdf/build:$PATH
33 33  
34 34 rm -rf install-mingw$wordsize install-msvc$wordsize
35 35  
36   -./config-mingw
  36 +./config-msvc
37 37 make -j8
38 38 make check install
39 39 make distclean
40 40  
41   -./config-msvc
  41 +./config-mingw
42 42 make -j8
43 43 make check install
44 44 make distclean
... ... @@ -49,9 +49,10 @@ set +x
49 49  
50 50 echo "Finished builds for $wordsize."
51 51  
52   -if [ "$wordsize" = 64 ]; then
  52 +if [ "$wordsize" = 32 ]; then
53 53 echo "If not done already, rerun this in a "`expr 96 - $wordsize`"-bit environment."
54 54 echo ''
  55 +else
55 56 echo 'Running "./make_windows_releases-finish".'
56 57 echo ''
57 58 ./make_windows_releases-finish
... ...