diff options
Diffstat (limited to 'scripts/make_win_bin_dist')
| -rwxr-xr-x | scripts/make_win_bin_dist | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index aa252ed2b7b..21bd1a7b025 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -141,7 +141,7 @@ 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" +MARIA_BINARIES="aria_chk aria_dump_log aria_ftdump aria_pack aria_read_log" mkdir $DESTDIR mkdir $DESTDIR/bin cp client/$TARGET/*.exe $DESTDIR/bin/ @@ -163,7 +163,7 @@ if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin fi -cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/ +cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/ if [ x"$TARGET" != x"release" ] ; then cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ cp client/$TARGET/mysql.pdb $DESTDIR/bin/ @@ -305,10 +305,7 @@ cp libmysql/$TARGET/libmysql.dll \ regex/$TARGET/regex.lib \ strings/$TARGET/strings.lib \ zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/ -if [ -d storage/innodb_plugin ]; then - cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.dll \ - $DESTDIR/lib/plugin/ -fi +cp storage/*/$TARGET/ha_*.dll $DESTDIR/lib/plugin/ if [ x"$TARGET" != x"release" ] ; then cp libmysql/$TARGET/libmysql.pdb \ @@ -317,10 +314,7 @@ if [ x"$TARGET" != x"release" ] ; then regex/$TARGET/regex.pdb \ strings/$TARGET/strings.pdb \ zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/ - if [ -d storage/innodb_plugin ]; then - cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.pdb \ - $DESTDIR/lib/plugin/ - fi + cp storage/*/$TARGET/ha_*.pdb $DESTDIR/lib/plugin/ fi @@ -341,12 +335,10 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \ strings/debug/strings.pdb \ zlib/debug/zlib.lib \ zlib/debug/zlib.pdb $DESTDIR/lib/debug/ - if [ -d storage/innodb_plugin ]; then - cp storage/innodb_plugin/debug/ha_innodb_plugin.dll \ - storage/innodb_plugin/debug/ha_innodb_plugin.lib \ - storage/innodb_plugin/debug/ha_innodb_plugin.pdb \ - $DESTDIR/lib/plugin/debug/ - fi + cp storage/*/debug/ha_*.dll \ + storage/*/debug/ha_*.lib \ + storage/*/debug/ha_*.pdb \ + $DESTDIR/lib/plugin/debug/ fi # ---------------------------------------------------------------------- @@ -361,7 +353,7 @@ cp -R mysql-test/{t,r,include,suite,std_data,lib,collections} $DESTDIR/mysql-tes 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} +rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb} # Note that this will not copy "extra" if a soft link |