1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automerge latest fixes from trunk into 5.1.46 release branch.

Browse Source
This commit is contained in:
unknown 2010-05-26 12:23:09 +02:00
commit 9febcb4776
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/libevent/Makefile.am
View File

@ -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

45
win/make_mariadb_win_dist
View File

@ -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