diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
| commit | 526b880fa25363319de3c33974b97865f6c54cae (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /Build-tools | |
| parent | 587f70f9ccfbcef3dfda084a675e02438e8f3668 (diff) | |
| parent | 6dd5fe215cf3a3f223dd6fffb1d8088c95f35f55 (diff) | |
| download | mariadb-git-526b880fa25363319de3c33974b97865f6c54cae.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/srv0start.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/manager.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Removed wrong define USE_SYMLINK
include/config-win.h:
Use original code
innobase/srv/srv0srv.c:
merge
innobase/usr/usr0sess.c:
merge
libmysql/libmysql.c:
merge
mysql-test/r/func_test.result:
merge
mysql-test/t/func_test.test:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-win-build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Build-tools/Do-win-build b/Build-tools/Do-win-build index b446ba6f601..0885507588c 100755 --- a/Build-tools/Do-win-build +++ b/Build-tools/Do-win-build @@ -22,6 +22,7 @@ if (!$opt_builddir) { $opt_tarball =~ /(mysql[^\/]*)-win-src\.tar/; $mysqlver=$1; $basedir = "$opt_builddir/$mysqlver"; +$scriptdir = `pwd`; # Make sure build dir exists mkdir($opt_builddir); @@ -47,6 +48,8 @@ chdir($mysqlver); system("\"$MSDEV\" mysql.dsw /MAKE \"ALL\" /OUT $mysqlver-build.log"); +system("cp $mysqlver-build.log $scriptdir"); + # # Print a help text message # @@ -55,10 +58,10 @@ sub print_help print <<EOF; Usage: Do-compile-win [options] source-tarball -Unpacks a Windows source distribution on the local machine and +Unpacks a Windows source distribution on the local machine and compiles it using VC++ 6.0. -This script is intended for Cygwin Perl. You must have a working +This script is intended for Cygwin Perl. You must have a working MSDEV.EXE in your path for compilation. @@ -68,8 +71,8 @@ Options: Print this text. --builddir=<dir> -Set the Cygwin path to build under; the tarball will actually -be moved to <builddir>/mysql-<version>/tarball and extracted under +Set the Cygwin path to build under; the tarball will actually +be moved to <builddir>/mysql-<version>/tarball and extracted under <builddir>/mysql-<version>/build. Default: /cygdrive/c/mysql-win-build |