mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
make_win_bin_dist:
Copy udf examples and raid.h Create target "include" directory before copying files to it CMakeLists.txt: Only compile in bdb if configured configure.in: Raised version number to 5.0.27
This commit is contained in:

parent
b96ab282ea
commit
08d47a3b81
@ -123,7 +123,9 @@ ADD_SUBDIRECTORY(heap)
|
|||||||
ADD_SUBDIRECTORY(myisam)
|
ADD_SUBDIRECTORY(myisam)
|
||||||
ADD_SUBDIRECTORY(myisammrg)
|
ADD_SUBDIRECTORY(myisammrg)
|
||||||
ADD_SUBDIRECTORY(client)
|
ADD_SUBDIRECTORY(client)
|
||||||
ADD_SUBDIRECTORY(bdb)
|
IF(WITH_BERKELEY_STORAGE_ENGINE)
|
||||||
|
ADD_SUBDIRECTORY(bdb)
|
||||||
|
ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
|
||||||
ADD_SUBDIRECTORY(innobase)
|
ADD_SUBDIRECTORY(innobase)
|
||||||
ADD_SUBDIRECTORY(sql)
|
ADD_SUBDIRECTORY(sql)
|
||||||
ADD_SUBDIRECTORY(sql/examples)
|
ADD_SUBDIRECTORY(sql/examples)
|
||||||
|
@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
|
|||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
# The Docs Makefile.am parses this line!
|
# The Docs Makefile.am parses this line!
|
||||||
# remember to also change ndb version below and update version.c in ndb
|
# remember to also change ndb version below and update version.c in ndb
|
||||||
AM_INIT_AUTOMAKE(mysql, 5.0.26)
|
AM_INIT_AUTOMAKE(mysql, 5.0.27)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
PROTOCOL_VERSION=10
|
PROTOCOL_VERSION=10
|
||||||
@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
|
|||||||
# ndb version
|
# ndb version
|
||||||
NDB_VERSION_MAJOR=5
|
NDB_VERSION_MAJOR=5
|
||||||
NDB_VERSION_MINOR=0
|
NDB_VERSION_MINOR=0
|
||||||
NDB_VERSION_BUILD=26
|
NDB_VERSION_BUILD=27
|
||||||
NDB_VERSION_STATUS=""
|
NDB_VERSION_STATUS=""
|
||||||
|
|
||||||
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
||||||
|
@ -144,8 +144,6 @@ fi
|
|||||||
# Copy data directory, readme files etc
|
# Copy data directory, readme files etc
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
|
|
||||||
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
|
|
||||||
|
|
||||||
# FIXME is there ever a data directory to copy?
|
# FIXME is there ever a data directory to copy?
|
||||||
if [ -d win/data ] ; then
|
if [ -d win/data ] ; then
|
||||||
cp -pR win/data $DESTDIR/data
|
cp -pR win/data $DESTDIR/data
|
||||||
@ -159,9 +157,13 @@ mkdir $DESTDIR/Docs
|
|||||||
cp Docs/INSTALL-BINARY $DESTDIR/Docs/
|
cp Docs/INSTALL-BINARY $DESTDIR/Docs/
|
||||||
cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true
|
cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true
|
||||||
cp ChangeLog $DESTDIR/Docs/ || /bin/true
|
cp ChangeLog $DESTDIR/Docs/ || /bin/true
|
||||||
cp COPYING $DESTDIR/Docs/
|
|
||||||
cp support-files/my-*.ini $DESTDIR/
|
cp support-files/my-*.ini $DESTDIR/
|
||||||
|
|
||||||
|
if [ -f COPYING ] ; then
|
||||||
|
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
|
||||||
|
cp COPYING $DESTDIR/Docs/
|
||||||
|
fi
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
# These will be filled in when we enable embedded. Note that if no
|
# These will be filled in when we enable embedded. Note that if no
|
||||||
# argument is given, it is copied if exists, else a check is done.
|
# argument is given, it is copied if exists, else a check is done.
|
||||||
@ -170,7 +172,8 @@ cp support-files/my-*.ini $DESTDIR/
|
|||||||
copy_embedded()
|
copy_embedded()
|
||||||
{
|
{
|
||||||
mkdir -p $DESTDIR/Embedded/DLL/release \
|
mkdir -p $DESTDIR/Embedded/DLL/release \
|
||||||
$DESTDIR/Embedded/static/release
|
$DESTDIR/Embedded/static/release \
|
||||||
|
$DESTDIR/include
|
||||||
cp libmysqld/libmysqld.def $DESTDIR/include/
|
cp libmysqld/libmysqld.def $DESTDIR/include/
|
||||||
cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
|
cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
|
||||||
cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/
|
cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/
|
||||||
@ -211,6 +214,9 @@ fi
|
|||||||
mkdir -p $DESTDIR/examples/tests
|
mkdir -p $DESTDIR/examples/tests
|
||||||
cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
|
cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
|
||||||
|
|
||||||
|
mkdir -p $DESTDIR/examples/udf_example
|
||||||
|
cp sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c $DESTDIR/examples/udf_example/
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
# FIXME why not copy it all in "include"?!
|
# FIXME why not copy it all in "include"?!
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
@ -228,6 +234,7 @@ cp include/conf*.h \
|
|||||||
include/m_string.h \
|
include/m_string.h \
|
||||||
include/m_ctype.h \
|
include/m_ctype.h \
|
||||||
include/my_global.h \
|
include/my_global.h \
|
||||||
|
include/raid.h \
|
||||||
include/typelib.h $DESTDIR/include/
|
include/typelib.h $DESTDIR/include/
|
||||||
cp libmysql/libmysql.def $DESTDIR/include/
|
cp libmysql/libmysql.def $DESTDIR/include/
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user