Commit 46f15669 authored by unknown's avatar unknown

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


Build-tools/Do-compile:
  Some small enhancements:
  
   - 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
parent 5185075c
...@@ -280,7 +280,7 @@ if ($opt_stage <= 3) ...@@ -280,7 +280,7 @@ if ($opt_stage <= 3)
{ {
my $flags= ""; my $flags= "";
log_timestamp(); 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) # No need to add the debug symbols, if the binaries are not stripped (saves space)
unless ($opt_with_debug || $opt_no_strip) unless ($opt_with_debug || $opt_no_strip)
{ {
...@@ -289,7 +289,7 @@ if ($opt_stage <= 3) ...@@ -289,7 +289,7 @@ if ($opt_stage <= 3)
$flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug); $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"); 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") if (-f "client/.libs/mysqladmin")
{ {
safe_system("cp client/.libs/mysqladmin $pwd/$host/bin"); safe_system("cp client/.libs/mysqladmin $pwd/$host/bin");
...@@ -301,11 +301,8 @@ if ($opt_stage <= 3) ...@@ -301,11 +301,8 @@ if ($opt_stage <= 3)
safe_system("$make clean") if ($opt_with_small_disk); safe_system("$make clean") if ($opt_with_small_disk);
} }
$tar_file=<$pwd/$host/*.tar.gz>; $tar_file=<$pwd/$host/mysql*.t*gz>;
if (!defined($tar_file)) abort ("Could not find tarball!") unless ($tar_file);
{
$tar_file=<$pwd/$host/*.tgz>;
}
# #
# Unpack the binary distribution # Unpack the binary distribution
...@@ -318,7 +315,7 @@ if ($opt_stage <= 4 && !$opt_no_test) ...@@ -318,7 +315,7 @@ if ($opt_stage <= 4 && !$opt_no_test)
safe_system("gunzip < $tar_file | $tar xf -"); safe_system("gunzip < $tar_file | $tar xf -");
} }
$tar_file =~ /(mysql[^\/]*)\.tar/; $tar_file =~ /(mysql[^\/]*)\.(tar\.gz|tgz)/;
$ver=$1; $ver=$1;
$test_dir="$pwd/$host/test/$ver"; $test_dir="$pwd/$host/test/$ver";
$ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment