Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into here.mwagner.org:/Volumes/BK/mysql-4.0

3 files changed, 28 insertions, 9 deletions

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index a46d83ca91c..fa3c6344a05 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -46,6 +46,7 @@ $opt_test= undef;
 $opt_skip_check= undef;
 $opt_skip_manual= undef;
 $opt_win_dist= undef;
+$opt_quiet= undef;
 $version= "unknown";
 $major=$minor=$release=0;
 
@@ -67,7 +68,8 @@ GetOptions(
 	"suffix=s",
 	"test|t",
 	"verbose|v",
-	"win-dist|w"
+	"win-dist|w",
+        "quiet|q",
 ) || print_help("");
 
 #
@@ -99,8 +101,6 @@ if (defined $opt_build_command)
 print_help("") if ($opt_help);
 defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
 
-$subject= "Bootstrap of $REPO failed" if $opt_mail;
-
 &logger("Starting build");
 &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
 &logger("Using $REPO as the BK parent repository");
@@ -306,7 +306,7 @@ if (!$opt_dry_run)
 #
 # Now build the source distribution
 #
-&logger("Compiling");
+&logger("Compiling...");
 $command= $build_command;
 &run_command($command, "Compilation failed!");
 
@@ -403,6 +403,7 @@ Options:
                            include a log file snippet, if logging is enabled)
                            Note that the \@-Sign needs to be quoted!
                            Example: --mail=user\\\@domain.com
+-q, --quiet                Be quiet
 -p, --pull                 Update the source BK trees before building
 -r, --revision=<rev>       Export the tree as of revision <rev>
                            (default is up to the latest revision)
diff --git a/Build-tools/logger.pm b/Build-tools/logger.pm
index 835d8014aa0..d3fb4c9db2f 100644
--- a/Build-tools/logger.pm
+++ b/Build-tools/logger.pm
@@ -5,7 +5,10 @@
 #
 sub logger
 {
-	my $message=$_[0];
+	my $message= $_[0];
+	my $cmnd= $_[1];
+
+	print $message . "\n" if !$opt_quiet && !$opt_verbose && !$cmnd;
 	print timestamp() . " " . $message . "\n" if $opt_verbose;
 	if (defined $opt_log && !$opt_dry_run)
 	{
@@ -30,9 +33,12 @@ sub run_command
 	}
 	else
 	{
-		&logger($command);
-		$command.= " >> $LOGFILE 2>&1" if defined $opt_log;
-		$command.= " > /dev/null" if (!$opt_verbose && !$opt_log);
+	        &logger($command, 1);
+
+		$command.= ';' unless ($command =~ m/^.*;$/);
+
+		$command =~ s/;/ >> $LOGFILE 2>&1;/g if defined $opt_log;
+		$command =~ s/;/ > \/dev\/null;/g if (!$opt_verbose && !$opt_log);
 		system($command) == 0 or &abort("$errormsg\n");
 	}
 }
@@ -47,6 +53,7 @@ sub abort
 {
 	my $message= $_[0];
 	my $messagefile;
+	my $subject= "Bootstrap of $REPO failed" if $opt_mail;
 	$message= "ERROR: " . $message;
 	&logger($message);
 
diff --git a/Build-tools/my_md5sum b/Build-tools/my_md5sum
index 20742ee2ed0..481a665af1a 100755
--- a/Build-tools/my_md5sum
+++ b/Build-tools/my_md5sum
@@ -10,10 +10,21 @@
 # Written by Matt Wagner <matt@mysql.com>
 #
 use strict;
+
+#
+# Use local perl libraries first. 'unshift' adds to the front of @INC
+# The local perl library dir hidden is $HOME/.perllibs on each build host
+#
+BEGIN
+{
+        my $homedir= $ENV{HOME};
+        unshift (@INC, "$homedir/.perllibs");
+}
+
 use Digest::MD5;
 use Getopt::Long;
 
-my $VER= "1.1";
+my $VER= "1.2";
 
 #
 # Strip the leading path info off the program name ($0). We want 'my_md5sum'