mirror of
https://github.com/MariaDB/server.git
synced 2026-04-25 09:45:31 +02:00
Fix make_win_bin_dist:
- Include maria_chk and other maria binaries
- Include sql/$TARGET/mysqld.lib, like mainline does (but what is that useful for?)
- Don't include my_safe_{process,kill} garbage.
- call '/bin/find', not just 'find' is that is some incompatible windows command.
This commit is contained in:
parent
87de323cb4
commit
fcb97aa7af
1 changed files with 21 additions and 3 deletions
|
|
@ -140,12 +140,24 @@ fi
|
|||
# ----------------------------------------------------------------------
|
||||
# Copy executables, and client DLL
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
MYISAM_BINARIES="myisamchk myisamlog myisampack myisam_ftdump"
|
||||
MARIA_BINARIES="maria_chk maria_dump_log maria_ftdump maria_pack maria_read_log"
|
||||
mkdir $DESTDIR
|
||||
mkdir $DESTDIR/bin
|
||||
cp client/$TARGET/*.exe $DESTDIR/bin/
|
||||
cp extra/$TARGET/*.exe $DESTDIR/bin/
|
||||
cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/
|
||||
|
||||
# MyISAM
|
||||
#cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/
|
||||
for eng in $MYISAM_BINARIES ; do
|
||||
cp storage/myisam/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
|
||||
done
|
||||
|
||||
# Maria
|
||||
for eng in $MARIA_BINARIES ; do
|
||||
cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
|
||||
done
|
||||
|
||||
cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/
|
||||
if [ x"$TARGET" != x"release" ] ; then
|
||||
cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/
|
||||
|
|
@ -280,6 +292,7 @@ cp include/mysql/plugin.h $DESTDIR/include/mysql/
|
|||
|
||||
mkdir -p $DESTDIR/lib/opt
|
||||
mkdir -p $DESTDIR/lib/plugin
|
||||
cp sql/$TARGET/mysqld.lib $DESTDIR/lib/
|
||||
cp libmysql/$TARGET/libmysql.dll \
|
||||
libmysql/$TARGET/libmysql.lib \
|
||||
libmysql/$TARGET/mysqlclient.lib \
|
||||
|
|
@ -340,6 +353,11 @@ cp mysql-test/mysql-test-run.pl $DESTDIR/mysql-test/
|
|||
cp mysql-test/README $DESTDIR/mysql-test/
|
||||
cp -R mysql-test/{t,r,include,suite,std_data,lib} $DESTDIR/mysql-test/
|
||||
|
||||
rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj}
|
||||
rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj}
|
||||
rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb,map}
|
||||
|
||||
|
||||
# Note that this will not copy "extra" if a soft link
|
||||
if [ -d mysql-test/extra ] ; then
|
||||
mkdir $DESTDIR/mysql-test/extra
|
||||
|
|
@ -378,7 +396,7 @@ cp scripts/*.sql $DESTDIR/share/
|
|||
# Clean up from possibly copied SCCS directories
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
rm -rf `find $DISTDIR -type d -name SCCS -print`
|
||||
rm -rf `/bin/find $DISTDIR -type d -name SCCS -print`
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Copy other files specified on command line DEST=SOURCE
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue