Commit d7f201ac authored by Bo Thorsen's avatar Bo Thorsen

Fix a couple of problems in the pack script, and disable a check feature that...

Fix a couple of problems in the pack script, and disable a check feature that doesn't work right now
parent 212d78ef
...@@ -17,7 +17,7 @@ fi ...@@ -17,7 +17,7 @@ fi
set -x set -x
if [ "x_$1" != "x_-nobuild" ]; then if [ "x_$1" != "x_-nobuild" ]; then
win/configure-mariadb.sh sh win/configure-mariadb.sh
cmake -G "Visual Studio 9 2008" cmake -G "Visual Studio 9 2008"
...@@ -27,7 +27,7 @@ fi ...@@ -27,7 +27,7 @@ fi
# TODO extract version number # TODO extract version number
VER=`cat configure.in | VER=`cat configure.in |
perl -e 'while (<>) { if (/^AM_INIT_AUTOMAKE\([a-z ]*, *([0-9a-z\.-]+)/) { print "$1\n"; exit(0)} } ; exit 1'` perl -e 'while (<>) { if (/^AC_INIT\(\[[a-zA-Z ]*\], *\[([0-9a-zA-Z\.-]+)\]/) { print "$1\n"; exit(0)} } ; exit 1'`
echo Version string: $VER. echo Version string: $VER.
...@@ -48,28 +48,28 @@ sh -x scripts/make_win_bin_dist $ZIPCONTENT ...@@ -48,28 +48,28 @@ sh -x scripts/make_win_bin_dist $ZIPCONTENT
mv $ZIPCONTENT.zip $ZIPFILE mv $ZIPCONTENT.zip $ZIPFILE
rm -rf unpack #rm -rf unpack
mkdir unpack #mkdir unpack
cd unpack #cd unpack
wget -O base.list.gz \ #wget -O base.list.gz \
http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz #http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz
gunzip base.list.gz #gunzip base.list.gz
unzip ../$ZIPFILE #unzip ../$ZIPFILE
(cd $ZIPCONTENT; /bin/find . | sort ) > new.list #(cd $ZIPCONTENT; /bin/find . | sort ) > new.list
diff -u base.list new.list || true #diff -u base.list new.list || true
RES=$? #RES=$?
cd .. #cd ..
#rm -rf unpack
rm -rf unpack
ls -lah $ZIPFILE ls -lah $ZIPFILE
echo "$ZIPFILE is the Windows noinstall binary zip" echo "$ZIPFILE is the Windows noinstall binary zip"
if [ $RES ] ; then #if [ $RES ] ; then
echo "Archive contents differ from the standard file list, check the diff output above" # echo "Archive contents differ from the standard file list, check the diff output above"
else #else
echo "Archive contents match the standard list, OK" # echo "Archive contents match the standard list, OK"
fi #fi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment