avl_tree: replace 'AVL_INLINE' with 'forceinline'

[wimlib] / tools / make-windows-release

diff --git a/tools/make-windows-release b/tools/make-windows-release
index 1b80d31529eb72fda5ea713025ff17f2747b7fa4..660e14703ae3a8652ce54b93b62cd073e28bd832 100755 (executable)
--- a/tools/make-windows-release
+++ b/tools/make-windows-release
@@ -10,8 +10,8 @@ if [ ! -e src/wim.c ]; then
        exit 1
 fi
 
-if [ $# -ne 1 ]; then
-       echo "Usage: $0 i686|x86_64" 1>&2
+if [ $# -lt 1 ]; then
+       echo "Usage: $0 i686|x86_64 [EXTRA_CONFIGURE_ARG]..." 1>&2
        exit 1
 fi
 
@@ -44,7 +44,8 @@ fi
 # Compile wimlib
 
 if ! grep -q "./configure --host=${ARCH}-w64-mingw32" config.log || \
-       ! grep -q "configure: exit 0" config.log
+       ! grep -q "configure: exit 0" config.log || \
+       [ $# -gt 0 ]
 then
        extra_args=
        if [ $ARCH = x86_64 ]; then
@@ -59,7 +60,7 @@ then
                LDFLAGS="-L$SYSROOT/lib"                                \
                PKG_CONFIG_PATH="$SYSROOT/lib/pkgconfig"                \
                --without-libcrypto                                     \
-               $extra_args
+               $extra_args "$@"
        $MAKE clean
 fi
 $MAKE
@@ -78,6 +79,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