X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tools%2Fmake-windows-release;h=6bee2af3384baef7a527e24764e7254a8241f683;hp=ee9790db510b767acd534e553b88c8edf413e2e9;hb=9a1b5749d00a890586b1f66409fd8758e70ecefa;hpb=64a61fd12ad824ac080c26fc8c453d001f389ef1

diff --git a/tools/make-windows-release b/tools/make-windows-release
index ee9790db..6bee2af3 100755
--- a/tools/make-windows-release
+++ b/tools/make-windows-release
@@ -27,8 +27,8 @@ i686|x86_64)
 	;;
 esac
 
-VERSION=$(grep 'This is wimlib version' README | \
-	  grep -o '\<[0-9]\+\.[0-9]\+\.[0-9]\+\(-BETA\)\?\>')
+VERSION=$(grep 'AC_INIT' configure.ac | \
+	  grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+[^]]*')
 DESTDIR=wimlib-${VERSION}-windows-${ARCH}-bin
 ZIPFILE=wimlib-${VERSION}-windows-${ARCH}-bin.zip
 MAKE="make -j $(grep -c processor /proc/cpuinfo)"
@@ -46,14 +46,20 @@ fi
 if ! grep -q "./configure --host=${ARCH}-w64-mingw32" config.log || \
 	! grep -q "configure: exit 0" config.log
 then
+	extra_args=
+	if [ $ARCH = x86_64 ]; then
+		extra_args="--enable-ssse3-sha1"
+	fi
 	# Note: putting -static-libgcc in CC is a workaround for libtool
 	# stripping it:
 	# http://www.gnu.org/software/libtool/manual/libtool.html#Stripped-link-flags
 	./configure --host=${ARCH}-w64-mingw32 --disable-static		\
 		CC="${ARCH}-w64-mingw32-gcc -static-libgcc"		\
-		CFLAGS="-O2 -Wall"					\
-		CPPFLAGS="-I$SYSROOT/include -I$SYSROOT/include/libxml2"\
-		LDFLAGS="-L$SYSROOT/lib"
+		CPPFLAGS="-I$SYSROOT/include"				\
+		LDFLAGS="-L$SYSROOT/lib"				\
+		PKG_CONFIG_PATH="$SYSROOT/lib/pkgconfig"		\
+		--without-libcrypto					\
+		$extra_args
 	$MAKE clean
 fi
 $MAKE
@@ -72,6 +78,12 @@ ${ARCH}-w64-mingw32-strip $DESTDIR/*.{dll,exe}
 
 cp NEWS README* COPYING* $DESTDIR
 cp $WINDEPDIR/COPYING* $DESTDIR
+
+sed -n '/^#/q; s/^[\/\* ]*//; p' src/divsufsort.c > $DESTDIR/COPYING.libdivsufsort-lite
+if ! grep -q 'Copyright' $DESTDIR/COPYING.libdivsufsort-lite; then
+	echo "ERROR: failed to extract libdivsufsort-lite license text" 1>&2
+	exit 1
+fi
 (
 	cd $DESTDIR
 	for fil in NEWS README* COPYING*; do
@@ -106,7 +118,7 @@ for fil in ./doc/man1/wimlib-imagex-*.1; do
 
 	sed 's/$/\r/g' > ${DESTDIR}/wim${cmd}.cmd <<- EOF
 		@echo off
-		%~dp0\\wimlib-imagex $cmd %*
+		"%~dp0\\wimlib-imagex" $cmd %*
 	EOF
 	chmod +x ${DESTDIR}/wim${cmd}.cmd
 done