- added option "--pull" to be able to update the BK repositories before

   starting the bootstrap

1 files changed, 21 insertions, 1 deletions

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index 33eca958ae0..747d73398ab 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -38,6 +38,7 @@ $opt_export_only= undef;
 $opt_help= $opt_verbose= 0;
 $opt_log= undef;
 $opt_mail= "";
+$opt_pull= undef;
 $opt_revision= undef;
 $opt_suffix= "";
 $opt_test= undef;
@@ -58,6 +59,7 @@ GetOptions(
 	"help|h",
 	"log|l:s",
 	"mail|m=s",
+	"pull|p",
 	"revision|r=s",
 	"skip-check|s",
 	"skip-manual",
@@ -111,6 +113,23 @@ if (($opt_directory ne ".") && (!-d $opt_directory && !$opt_dry_run))
 &logger("Logging to $LOGFILE") if (defined $opt_log);
 
 #
+# Pull recent changes first
+#
+if ($opt_pull)
+{
+	&logger("Updating BK tree $REPO to latest ChangeSet first");
+	$command= "cd $REPO; bk pull; cd ..";
+	&run_command($command, "Could not update $REPO!");
+
+	unless ($opt_skip_manual)
+	{
+		&logger("Updating manual tree in $opt_docdir");
+		$command= "cd $opt_docdir; bk pull; cd ..";
+		&run_command($command, "Could not update $opt_docdir!");
+	}
+}
+
+#
 # Use a temporary name until we know the version number
 #
 $target_dir= $opt_directory . "/mysql-" . $$ . "-" . time() . ".tmp";
@@ -253,7 +272,7 @@ if (defined $opt_changelog)
 #
 # Add the latest manual from the mysqldoc tree
 #
-if (!$opt_skip_manual)
+unless ($opt_skip_manual)
 {
 	$msg= "Adding manual.texi";
 	&logger($msg);
@@ -378,6 +397,7 @@ Options:
                            include a log file snippet, if logging is enabled)
                            Note that the \@-Sign needs to be quoted!
                            Example: --mail=user\\\@domain.com
+-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)
 -s, --skip-check           Skip checking the distribution with "make distcheck"