lzx-compress.c: Rename lzx_record_ctx.matches

[wimlib] / make-windows-release

diff --git a/make-windows-release b/make-windows-release
index 14637e1b72da528e075b8e0dd307e93c574acaa1..298b37cb9c94605e31cc04684830693286eac47d 100755 (executable)
--- a/make-windows-release
+++ b/make-windows-release
@@ -1,16 +1,11 @@
 #!/bin/bash
 
-set -e -u
+set -e
 
 WIMLIB_ARCH=i686
 if [ $# -ge 1 ]; then
        WIMLIB_ARCH=$1
-fi
-
-if [ $# -ge 2 ]; then
-       CONF_EXTRA_ARGS="$2"
-else
-       CONF_EXTRA_ARGS=
+       shift
 fi
 
 if [[ $WIMLIB_ARCH = i686 ]] ; then
@@ -22,21 +17,26 @@ else
        exit 2
 fi
 
-VERSION=$(grep 'This is wimlib version' README | grep -o '[0-9]\+\.[0-9]\+\.[0-9]')
+CONF_EXTRA_ARGS=("$@")
+
+VERSION=$(grep 'This is wimlib version' README | \
+         grep -o '\<[0-9]\+\.[0-9]\+\.[0-9]\+\(-BETA\)\?\>')
 ZIPFILE=wimlib-${VERSION}-windows-${WIMLIB_ARCH}-bin.zip
 
 if ! grep -q "./configure --host=${WIMLIB_ARCH}-w64-mingw32" config.log; then
-       ./configure --host=${WIMLIB_ARCH}-w64-mingw32 $CONF_EXTRA_ARGS
+       ./configure --host=${WIMLIB_ARCH}-w64-mingw32 "${CONF_EXTRA_ARGS[@]}"
        make clean
 fi
 
 make -j2
 
-rm -f $DESTDIR/{libwim-*.dll,doc/*,README*,NEWS*,wim*.bat,wim*.cmd}
+rm -f $DESTDIR/{libwim-*.dll,doc/*,wim*.bat,wim*.cmd}
+
+TEXTFILES=(NEWS README* COPYING*)
 
 cp .libs/imagex.exe $DESTDIR/wimlib-imagex.exe
 cp .libs/libwim-*.dll $DESTDIR
-cp README* NEWS $DESTDIR
+cp "${TEXTFILES[@]}" $DESTDIR
 
 function genman() {
        local name=$1
@@ -65,7 +65,7 @@ done
 
 genman wimlib-imagex
 
-for fil in $DESTDIR/{README*,NEWS}; do
+for fil in "${TEXTFILES[@]/#/$DESTDIR/}"; do
        sed < $fil > ${fil}.txt -e 's/$/\r/g'
        rm $fil
 done