X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=make-windows-release;h=298b37cb9c94605e31cc04684830693286eac47d;hp=697405dcc183cae004e2716155e4b08e061f0293;hb=e982067dbc89861c23a2655ddbf10e44c8b707fd;hpb=e492b354050ff9b652ea68b4d9e6b30aa849f1a0

diff --git a/make-windows-release b/make-windows-release
index 697405dc..298b37cb 100755
--- 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,23 +17,37 @@ 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
 
-for fil in ./doc/wimlib-imagex.1 ./doc/wimlib-imagex-*.1; do
+function genman() {
+	local name=$1
+	local dest=$DESTDIR/doc/${name}.pdf
+
+	echo "Generating $dest"
+
+	MANPATH="./doc" man -t $name | ps2pdf - $dest
+}
+
+for fil in ./doc/man1/wimlib-imagex-*.1; do
 	base=`basename $fil`
 	base=${base%%.1}
 	cmd=$(echo $base | sed s/wimlib-imagex-//)
@@ -46,17 +55,17 @@ for fil in ./doc/wimlib-imagex.1 ./doc/wimlib-imagex-*.1; do
 		continue
 	fi
 
-	echo $fil
-	#MANWIDTH=80 man $fil | col -b > $DESTDIR/doc/$base
-	man -t $fil | ps2pdf - $DESTDIR/doc/${base}.pdf
+	genman $base
+
 	sed 's/$/\r/g' > $DESTDIR/wim${cmd}.cmd <<- EOF
 		@echo off
 		%~dp0\\wimlib-imagex $cmd %*
 	EOF
 done
 
-#for fil in $DESTDIR/{README*,NEWS} $DESTDIR/doc/*; do
-for fil in $DESTDIR/{README*,NEWS}; do
+genman wimlib-imagex
+
+for fil in "${TEXTFILES[@]/#/$DESTDIR/}"; do
 	sed < $fil > ${fil}.txt -e 's/$/\r/g'
 	rm $fil
 done