X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=make-windoze-release;h=fc981faeb8f841738ca7b50538085b465d5c6271;hp=3fd126ad06149d541b411a249057eaf402ddb620;hb=48fbbd68e82d879e2cb6f384c1440e81373338c7;hpb=a3c287beb780cb26efef17fca6d15331f285eb9c

diff --git a/make-windoze-release b/make-windoze-release
index 3fd126ad..fc981fae 100755
--- a/make-windoze-release
+++ b/make-windoze-release
@@ -2,37 +2,50 @@
 
 set -e -u
 
-if true; then
+WIMLIB_ARCH=i686
+if [ $# -ge 1 ]; then
+	WIMLIB_ARCH=$1
+fi
+
+if [[ $WIMLIB_ARCH = i686 ]] ; then
 	DESTDIR=/mnt/tmp/wimlib
-	ARCH=i686
+elif [[ $WIMLIB_ARCH = x86_64 ]]; then
+	DESTDIR=/mnt/tmp/x64/wimlib
 else
-	DESTDIR=/mnt/tmp/wimlib-x64
-	ARCH=x86_64
+	echo "Unknown architecture $1" 1>&2
+	exit 2
 fi
 
 VERSION=$(grep 'This is wimlib version' README | grep -o '[0-9]\+\.[0-9]\+\.[0-9]')
-ZIPFILE=wimlib-${VERSION}-windows-${ARCH}-bin.zip
+ZIPFILE=wimlib-${VERSION}-windows-${WIMLIB_ARCH}-bin.zip
 
-if ! grep -q "./configure --host=${ARCH}-w64-mingw32" config.log; then
-	./configure --host=${ARCH}-w64-mingw32
+if ! grep -q "./configure --host=${WIMLIB_ARCH}-w64-mingw32" config.log; then
+	./configure --host=${WIMLIB_ARCH}-w64-mingw32
 fi
 
 make -j2
 
-rm -f $DESTDIR/{libwim-*.dll,doc/*,README*,NEWS*}
+rm -f $DESTDIR/{libwim-*.dll,doc/*,README*,NEWS*,wim*.bat,wim*.cmd}
 
 cp .libs/imagex.exe $DESTDIR/wimlib-imagex.exe
 cp .libs/libwim-*.dll $DESTDIR
 cp README* NEWS $DESTDIR
 
-
-
 for fil in ./doc/wimlib-imagex-*.1; do
-	echo $fil
 	base=`basename $fil`
 	base=${base%%.1}
+	cmd=$(echo $base | sed s/wimlib-imagex-//)
+	if [ $cmd == mount -o $cmd == mountrw -o $cmd == unmount ]; then
+		continue
+	fi
+
+	echo $fil
 	#MANWIDTH=80 man $fil | col -b > $DESTDIR/doc/$base
 	man -t $fil | ps2pdf - $DESTDIR/doc/${base}.pdf
+	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
@@ -41,11 +54,11 @@ for fil in $DESTDIR/{README*,NEWS}; do
 	rm $fil
 done
 
+${WIMLIB_ARCH}-w64-mingw32-strip $DESTDIR/*.{dll,exe}
 
 rm -f $ZIPFILE
 (
 	dir=$PWD
-	cd $(dirname $DESTDIR) &> /dev/null
-	zip -r $dir/$ZIPFILE $(basename $DESTDIR)
+	cd $DESTDIR
+	zip -r $dir/$ZIPFILE .
 )
-