maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2858
committer: Bo Thorsen <bo@xxxxxxxxxxxx>
branch nick: trunk-work
timestamp: Tue 2010-05-25 16:56:35 +0200
message:
  Fix a couple of problems in the pack script, and disable a check feature that doesn't work right now
modified:
  win/make_mariadb_win_dist


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

=== modified file 'win/make_mariadb_win_dist'
--- win/make_mariadb_win_dist	2010-05-14 12:12:23 +0000
+++ win/make_mariadb_win_dist	2010-05-25 14:56:35 +0000
@@ -17,7 +17,7 @@
 set -x
 
 if [ "x_$1" != "x_-nobuild" ]; then
-  win/configure-mariadb.sh
+  sh win/configure-mariadb.sh
 
   cmake -G "Visual Studio 9 2008"
 
@@ -27,7 +27,7 @@
 
 # TODO extract version number
 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.
 
@@ -48,28 +48,28 @@
 
 mv $ZIPCONTENT.zip $ZIPFILE
 
-rm -rf unpack
-mkdir unpack
-
-cd unpack
-wget -O base.list.gz \
-http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz
-gunzip base.list.gz
-unzip ../$ZIPFILE
-(cd $ZIPCONTENT; /bin/find . | sort ) > new.list
-
-diff -u base.list new.list || true
-RES=$?
-
-cd ..
-
-rm -rf unpack
+#rm -rf unpack
+#mkdir unpack
+
+#cd unpack
+#wget -O base.list.gz \
+#http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz
+#gunzip base.list.gz
+#unzip ../$ZIPFILE
+#(cd $ZIPCONTENT; /bin/find . | sort ) > new.list
+
+#diff -u base.list new.list || true
+#RES=$?
+
+#cd ..
+
+#rm -rf unpack
+
 ls -lah $ZIPFILE
 echo "$ZIPFILE is the Windows noinstall binary zip"
 
-if [ $RES ] ; then
-  echo "Archive contents differ from the standard file list, check the diff output above"
-else
-  echo "Archive contents match the standard list, OK"
-fi
-
+#if [ $RES ] ; then
+#  echo "Archive contents differ from the standard file list, check the diff output above"
+#else
+#  echo "Archive contents match the standard list, OK"
+#fi