diff options
| author | lenz@mysql.com <> | 2004-02-04 14:16:36 +0100 |
|---|---|---|
| committer | lenz@mysql.com <> | 2004-02-04 14:16:36 +0100 |
| commit | b0e641b7b51fbd5da34509f731221aa82b409e4a (patch) | |
| tree | 25028dc004372f576fa30ad96e1531c755006410 | |
| parent | 2fa7447a1659d7503a73183bac8a81ab041918ab (diff) | |
| download | mariadb-git-b0e641b7b51fbd5da34509f731221aa82b409e4a.tar.gz | |
Some small enhancements for Do-compile:
- more flexible removal of old cruft before creating the new binary
distribution
- more flexible globbing for the binary tarball (required for QNX, where
the file name ends on *.tgz instead of .tar.gz due to file name lenght
restrictions
| -rwxr-xr-x | Build-tools/Do-compile | 13 |
1 files changed, 5 insertions, 8 deletions
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" . |