Commit ad976d1e authored by lenz@mysql.com's avatar lenz@mysql.com

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

   starting the bootstrap
parent 38a5d1b7
...@@ -38,6 +38,7 @@ $opt_export_only= undef; ...@@ -38,6 +38,7 @@ $opt_export_only= undef;
$opt_help= $opt_verbose= 0; $opt_help= $opt_verbose= 0;
$opt_log= undef; $opt_log= undef;
$opt_mail= ""; $opt_mail= "";
$opt_pull= undef;
$opt_revision= undef; $opt_revision= undef;
$opt_suffix= ""; $opt_suffix= "";
$opt_test= undef; $opt_test= undef;
...@@ -58,6 +59,7 @@ GetOptions( ...@@ -58,6 +59,7 @@ GetOptions(
"help|h", "help|h",
"log|l:s", "log|l:s",
"mail|m=s", "mail|m=s",
"pull|p",
"revision|r=s", "revision|r=s",
"skip-check|s", "skip-check|s",
"skip-manual", "skip-manual",
...@@ -110,6 +112,23 @@ if (($opt_directory ne ".") && (!-d $opt_directory && !$opt_dry_run)) ...@@ -110,6 +112,23 @@ if (($opt_directory ne ".") && (!-d $opt_directory && !$opt_dry_run))
&logger("Logging to $LOGFILE") if (defined $opt_log); &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 # Use a temporary name until we know the version number
# #
...@@ -253,7 +272,7 @@ if (defined $opt_changelog) ...@@ -253,7 +272,7 @@ if (defined $opt_changelog)
# #
# Add the latest manual from the mysqldoc tree # Add the latest manual from the mysqldoc tree
# #
if (!$opt_skip_manual) unless ($opt_skip_manual)
{ {
$msg= "Adding manual.texi"; $msg= "Adding manual.texi";
&logger($msg); &logger($msg);
...@@ -378,6 +397,7 @@ Options: ...@@ -378,6 +397,7 @@ Options:
include a log file snippet, if logging is enabled) include a log file snippet, if logging is enabled)
Note that the \@-Sign needs to be quoted! Note that the \@-Sign needs to be quoted!
Example: --mail=user\\\@domain.com Example: --mail=user\\\@domain.com
-p, --pull Update the source BK trees before building
-r, --revision=<rev> Export the tree as of revision <rev> -r, --revision=<rev> Export the tree as of revision <rev>
(default is up to the latest revision) (default is up to the latest revision)
-s, --skip-check Skip checking the distribution with "make distcheck" -s, --skip-check Skip checking the distribution with "make distcheck"
......
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