diff --git a/README.maintainer b/README.maintainer index cbd0beb4..1a4e57fe 100644 --- a/README.maintainer +++ b/README.maintainer @@ -45,9 +45,8 @@ Release Reminders * To create Windows binary releases, extract the qpdf source distribution in Windows (MSYS + MINGW, MSVC) and run - ./make_windows_releases from there. You will have to manually - create zip files from the install-mingw and install-msys - directories; instructions are echoed by the script. + ./make_windows_releases from there. You will need to have zip in + your path. * Remember to copy README-what-to-download.txt separately onto the download area and make it the default for Windows platforms. diff --git a/make_dist b/make_dist index d0004162..d5f11a2e 100755 --- a/make_dist +++ b/make_dist @@ -52,7 +52,7 @@ $fh = safe_open("libqpdf/QPDF.cc"); my $code_version = 'unknown'; while (<$fh>) { - if (m/QPDF::qpdf_version = ([^\"]+)\"/) + if (m/QPDF::qpdf_version = \"([^\"]+)\"/) { $code_version = $1; last; @@ -91,7 +91,7 @@ if ($version ne $config_version) } if ($version ne $code_version) { - print "$whoami: qpdf.cc version = $code_version\n"; + print "$whoami: QPDF.cc version = $code_version\n"; $version_error = 1; } if ($version ne $doc_version) diff --git a/make_windows_releases b/make_windows_releases index 59e30208..eb7fc7e5 100755 --- a/make_windows_releases +++ b/make_windows_releases @@ -21,8 +21,14 @@ make distclean cp -p README-windows-install.txt install-mingw/qpdf*/README.txt cp -p README-windows-install.txt install-msvc/qpdf*/README.txt +cd install-mingw +v=qpdf-* +zip -r ../$v-bin-mingw.zip $v +cd ../install-msys +zip -r ../$v-bin-msvc.zip $v +cd .. + set +x echo "" -echo "Create qpdf-VERSION-bin-mingw.zip from install-mingw." -echo "Create qpdf-VERSION-bin-msvc.zip from install-msvc." +echo "$v-bin-mingw.zip adn $v-bin-msvc.zip have been created."