Merge mysql.com:/space/my/mysql-4.0

into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged

1 files changed, 23 insertions, 21 deletions

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index a7d347ba32f..fc36c51ec85 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -26,7 +26,7 @@ else
 }
 
 # Some predefined settings
-$build_command= "BUILD/compile-pentium-max";
+$build_command= "BUILD/compile-dist";
 $PWD= cwd();
 $opt_docdir= $PWD . "/mysqldoc";
 $opt_archive_log= undef;
@@ -70,7 +70,7 @@ GetOptions(
 	"test|t",
 	"verbose|v",
 	"win-dist|w",
-        "quiet|q",
+	"quiet|q",
 ) || print_help("");
 
 #
@@ -122,18 +122,8 @@ if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run))
 #
 if ($opt_pull)
 {
-	&logger("Updating BK tree $REPO to latest ChangeSet first");
-  chdir ($REPO) or &abort("Could not chdir to $REPO!");
-	&run_command("bk pull", "Could not update $REPO!");
-  chdir ($PWD) or &abort("Could not chdir to $PWD!");
-
-	unless ($opt_skip_manual)
-	{
-		&logger("Updating manual tree in $opt_docdir");
-    chdir ($opt_docdir) or &abort("Could not chdir to $opt_docdir!");
-	  &run_command("bk pull", "Could not update $opt_docdir!");
-    chdir ($PWD) or &abort("Could not chdir to $PWD!");
-	}
+	&bk_pull("$REPO");
+	&bk_pull("$opt_docdir") unless ($opt_skip_manual);
 }
 
 #
@@ -270,7 +260,7 @@ if (defined $opt_changelog)
 	$command.= " " . $REPO . " > $target_dir/ChangeLog";
 	&logger($command);
 	# We cannot use run_command here because of output redirection
-	if (!$opt_dry_run)
+	unless ($opt_dry_run)
 	{
 		system($command) == 0 or &abort("Could not create $target_dir/ChangeLog!");
 	}
@@ -281,17 +271,17 @@ if (defined $opt_changelog)
 #
 unless ($opt_skip_manual)
 {
-	$msg= "Updating manual files";
-	&logger($msg);
+	&logger("Updating manual files");
 	foreach $file qw/internals manual reservedwords/
 	{
 		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0
 		or &abort("Could not update $file.texi in $target_dir/Docs/!");
 	}
-        system ("rm -f $target_dir/Docs/Images/Makefile*") == 0
-        or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");
-        system ("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images") == 0
-        or &abort("Could not copy image files in $target_dir/Docs/Images/!");
+
+	&run_command("rm -f $target_dir/Docs/Images/Makefile*",
+ 	  "Could not remove Makefiles in $target_dir/Docs/Images/!");
+	&run_command("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images",
+	  "Could not copy image files in $target_dir/Docs/Images/!");
 }
 
 #
@@ -378,6 +368,18 @@ if ($opt_archive_log)
 exit 0;
 
 #
+# Run a BK pull on the given BK tree
+#
+sub bk_pull
+{
+  my $bk_tree= $_[0];
+	&logger("Updating BK tree $bk_tree to latest ChangeSet first");
+  chdir ($bk_tree) or &abort("Could not chdir to $bk_tree!");
+	&run_command("bk pull", "Could not update $bk_tree!");
+  chdir ($PWD) or &abort("Could not chdir to $PWD!");
+}
+
+#
 # Print the help text message (with an optional message on top)
 #
 sub print_help