diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-05-26 12:23:09 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-05-26 12:23:09 +0200 |
| commit | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (patch) | |
| tree | 938bce9de39ab0b91955d63d3bfb1506fbbcdaaa | |
| parent | d120c5b562629dda782e3c9a66cfeaa48cbb01d1 (diff) | |
| parent | e6eab96555d8cf70cbe6c8a94956855a0b5eca43 (diff) | |
| download | mariadb-git-9febcb4776e563a93eb8fff247174b0e2eb2ae0b.tar.gz | |
Automerge latest fixes from trunk into 5.1.46 release branch.
| -rw-r--r-- | extra/libevent/Makefile.am | 2 | ||||
| -rw-r--r-- | win/make_mariadb_win_dist | 45 |
2 files changed, 23 insertions, 24 deletions
diff --git a/extra/libevent/Makefile.am b/extra/libevent/Makefile.am index 702c07c6eeb..1c9066c3122 100644 --- a/extra/libevent/Makefile.am +++ b/extra/libevent/Makefile.am @@ -36,4 +36,4 @@ event-config.h: $(top_builddir)/include/config.h -e 's/#ifndef /#ifndef _EVENT_/' < $(top_builddir)/include/config.h >> $@ echo "#endif" >> $@ -AM_CPPFLAGS = -Icompat -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/compat -I$(top_srcdir)/include diff --git a/win/make_mariadb_win_dist b/win/make_mariadb_win_dist index 67d23e55b8e..e4cf611c0e3 100644 --- a/win/make_mariadb_win_dist +++ b/win/make_mariadb_win_dist @@ -17,7 +17,7 @@ fi set -x if [ "x_$1" != "x_-nobuild" ]; then - win/configure-mariadb.sh + sh win/configure-mariadb.sh cmake -G "Visual Studio 9 2008" @@ -25,14 +25,13 @@ if [ "x_$1" != "x_-nobuild" ]; then devenv.com MySQL.sln /build Debug fi -# 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. -# Remove '-maria-' from version number -VER_NO_MARIA=${VER/maria-/} +# Remove '-mariaDB' from version number +VER_NO_MARIA=${VER/-MariaDB/} # We want the final zip to be named like this: # mariadb-noinstall-5.1.38-win32.zip @@ -48,28 +47,28 @@ sh -x scripts/make_win_bin_dist $ZIPCONTENT mv $ZIPCONTENT.zip $ZIPFILE -rm -rf unpack -mkdir 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 +#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=$? +#diff -u base.list new.list || true +#RES=$? -cd .. +#cd .. + +#rm -rf unpack -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 |