diff options
| author | unknown <lenz@mysql.com> | 2004-07-13 21:50:09 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-07-13 21:50:09 +0200 |
| commit | 5eb3dc3223b20f72f799923db541f6fd585aabed (patch) | |
| tree | 63ff7c0aba80406a77b947085c1991a55765c885 | |
| parent | 98708011233ac2ba78650a5f67f6b4ade0c762f7 (diff) | |
| parent | d2415e8188302a6ccbc3414896405dabed9691eb (diff) | |
| download | mariadb-git-5eb3dc3223b20f72f799923db541f6fd585aabed.tar.gz | |
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
| -rwxr-xr-x | Build-tools/Do-compile | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 40a5cf38121..1650e3d4a09 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -169,6 +169,17 @@ info("PATH is $ENV{PATH}"); log_timestamp(); +$md5_result= safe_system("perl $ENV{HOME}/my_md5sum -c ${opt_distribution}.md5"); + +if ($md5_result != 0) +{ + abort("MD5 check failed for $opt_distribution!"); +} +else +{ + info("SUCCESS: MD5 checks for $opt_distribution"); +} + if (-x "$host/bin/mysqladmin") { log_system("$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -s shutdown"); @@ -202,17 +213,6 @@ if ($opt_stage == 0) safe_cd($host); if ($opt_stage == 0 && ! $opt_use_old_distribution) { - $md5_result= safe_system("./my_md5sum -c ${opt_distribution}.md5"); - - if ($md5_result != 0) - { - abort("MD5 failed for $opt_distribution!"); - } - else - { - info("SUCCESS: MD5 checks for $opt_distribution"); - } - safe_system("gunzip < $opt_distribution | $tar xf -"); # Fix file times; This is needed because the time for files may be @@ -332,7 +332,9 @@ $tar_file=<$pwd/$host/mysql*.t*gz>; abort ("Could not find tarball!") unless ($tar_file); # Generate the MD5 for the binary distribution -safe_system("./my_md5sum $tar_file > ${tar_file}.md5}"); +$tar_file=~ /(mysql[^\/]*)\.(tar\.gz|tgz)/; +$tar_file_lite= "$1.$2"; +system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lite}.md5"); # # Unpack the binary distribution |