diff options
| author | unknown <greg@mysql.com> | 2004-02-09 12:16:33 -0100 |
|---|---|---|
| committer | unknown <greg@mysql.com> | 2004-02-09 12:16:33 -0100 |
| commit | 945c2c1cb411e8792843c0f3c0208265954cf101 (patch) | |
| tree | a7c2b919d5ff697eebd94ffebf7393dee7871f67 /Build-tools | |
| parent | 1d3cc816fd29e3bd7363d23240a1a9cb2126989f (diff) | |
| parent | 68d61d5b8fe1ddb2e4a0dd243623528e6aed70fd (diff) | |
| download | mariadb-git-945c2c1cb411e8792843c0f3c0208265954cf101.tar.gz | |
Merge
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Bootstrap | 2 | ||||
| -rwxr-xr-x | Build-tools/Do-compile | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 930d053b113..a46d83ca91c 100755 --- a/Build-tools/Bootstrap +++ b/Build-tools/Bootstrap @@ -257,7 +257,7 @@ if (defined $opt_changelog) $msg= "Adding $target_dir/ChangeLog"; $msg.= " (down to revision $opt_changelog)" if $opt_changelog ne ""; &logger($msg); - $command= "bk changes -v"; + $command= "bk changes -mv"; $command.= " -r" if ($opt_changelog ne "" || $opt_revision); $command.= $opt_changelog if $opt_changelog ne ""; $command.= ".." if ($opt_changelog ne "" && !$opt_revision); diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index e92654ccffd..bd6c89d7ded 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -280,7 +280,7 @@ if ($opt_stage <= 3) { my $flags= ""; log_timestamp(); - log_system("rm -fr mysql-3* mysql-4* $pwd/$host/*.tar.gz"); + log_system("rm -fr mysql-{3,4,5}* $pwd/$host/mysql*.t*gz"); # No need to add the debug symbols, if the binaries are not stripped (saves space) unless ($opt_with_debug || $opt_no_strip) { @@ -289,7 +289,7 @@ if ($opt_stage <= 3) $flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug); check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created"); - safe_system("mv mysql*.tar.gz $pwd/$host"); + safe_system("mv mysql*.t*gz $pwd/$host"); if (-f "client/.libs/mysqladmin") { safe_system("cp client/.libs/mysqladmin $pwd/$host/bin"); @@ -301,11 +301,8 @@ if ($opt_stage <= 3) safe_system("$make clean") if ($opt_with_small_disk); } -$tar_file=<$pwd/$host/*.tar.gz>; -if (!defined($tar_file)) -{ - $tar_file=<$pwd/$host/*.tgz>; -} +$tar_file=<$pwd/$host/mysql*.t*gz>; +abort ("Could not find tarball!") unless ($tar_file); # # Unpack the binary distribution @@ -318,7 +315,7 @@ if ($opt_stage <= 4 && !$opt_no_test) safe_system("gunzip < $tar_file | $tar xf -"); } -$tar_file =~ /(mysql[^\/]*)\.tar/; +$tar_file =~ /(mysql[^\/]*)\.(tar\.gz|tgz)/; $ver=$1; $test_dir="$pwd/$host/test/$ver"; $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . |