diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-01 21:37:03 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-01 21:37:03 +0100 |
| commit | c87923dc2d3f6b5e96d51957937be8a5b343ab51 (patch) | |
| tree | b2aa4348ad143b02bb0c44e1c3adee989bfd4a85 /scripts | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-c87923dc2d3f6b5e96d51957937be8a5b343ab51.tar.gz | |
Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings
- Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010).
Remove map files from packaging.
- Fix warning about ETIMEDOUT being redefined.
- Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch)
- Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin.
- Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_win_bin_dist | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index c3c7f9a61b4..b47096ee5d5 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -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/ @@ -177,7 +177,6 @@ cp tests/$TARGET/*.exe $DESTDIR/bin/ cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/ cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe -cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map if [ x"$TARGET" != x"release" ] ; then cp sql/$TARGET/mysqld.pdb $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb fi @@ -186,7 +185,6 @@ if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \ x"$PACK_DEBUG" = x"yes" ] ; then cp sql/debug/mysqld.exe $DESTDIR/bin/mysqld-debug.exe cp sql/debug/mysqld.pdb $DESTDIR/bin/mysqld-debug.pdb - cp sql/debug/mysqld.map $DESTDIR/bin/mysqld-debug.map fi # ---------------------------------------------------------------------- @@ -362,7 +360,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 |