Commit 6d8f8336 authored by lenz@mysql.com's avatar lenz@mysql.com

- added new option "--build-command" to be able to use different

   commands for building the sources
 - removed duplicate option "--revision"
 - added help for new option and reformatted help text a bit
parent ae242833
...@@ -30,6 +30,7 @@ chomp ($LOGFILE= `pwd`); ...@@ -30,6 +30,7 @@ chomp ($LOGFILE= `pwd`);
$LOGFILE.= "/Bootstrap.log"; $LOGFILE.= "/Bootstrap.log";
chomp ($opt_directory= `pwd`); chomp ($opt_directory= `pwd`);
$opt_docdir= $opt_directory . "/mysqldoc"; $opt_docdir= $opt_directory . "/mysqldoc";
$opt_build_command= undef;
$opt_changelog= undef; $opt_changelog= undef;
$opt_delete= undef; $opt_delete= undef;
$opt_dry_run= undef; $opt_dry_run= undef;
...@@ -44,6 +45,7 @@ $opt_skip_manual= undef; ...@@ -44,6 +45,7 @@ $opt_skip_manual= undef;
$version= "unknown"; $version= "unknown";
GetOptions( GetOptions(
"build_command|b=s",
"changelog|c:s", "changelog|c:s",
"directory|d=s", "directory|d=s",
"delete", "delete",
...@@ -54,7 +56,6 @@ GetOptions( ...@@ -54,7 +56,6 @@ GetOptions(
"log|l:s", "log|l:s",
"mail|m=s", "mail|m=s",
"revision|r=s", "revision|r=s",
"revision|r=s",
"skip-check|s", "skip-check|s",
"skip-manual", "skip-manual",
"suffix=s", "suffix=s",
...@@ -81,6 +82,14 @@ if (defined $opt_log) ...@@ -81,6 +82,14 @@ if (defined $opt_log)
} }
} }
#
# Override predefined build command
#
if (defined $opt_build_command)
{
$build_command= $opt_build_command;
}
print_help("") if ($opt_help); print_help("") if ($opt_help);
defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!"); defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
...@@ -329,36 +338,41 @@ archive is being created. ...@@ -329,36 +338,41 @@ archive is being created.
Options: Options:
-c, --changelog[=<rev>] Add a ChangeLog [down to revision <rev>] -b, --build-command=<cmd> Use <cmd> to compile the sources before packing
This will automatically be included in the source the distribution.
distribution. To get a ChangeLog down to the last (default is "$build_command")
tagged Changeset, simply use "last" as the revision -c, --changelog[=<rev>] Add a ChangeLog [down to revision <rev>]
number. This will automatically be included in the source
--delete Delete an already existing distribution directory distribution. To get a ChangeLog down to the last
in the target directory instead of renaming it. tagged Changeset, simply use "last" as the revision
-d, --directory=<dir> Specify the target directory number.
(default is "$opt_directory") --delete Delete an already existing distribution directory
--docdir=<dir> Use the MySQL documentation BK tree located in in <dir> in the target directory instead of renaming it.
(default is "$opt_docdir") -d, --directory=<dir> Specify the target directory
--dry-run Dry run without executing (default is "$opt_directory")
-e, --export-only Just export (and add the ChangeLog, if requested), --docdir=<dir> Use the MySQL documentation BK tree located
do not build or test the source distribution in <dir>
-h, --help Print this help message (default is "$opt_docdir")
-l, --log[=<filename>] Write a log file [to <filename>] --dry-run Dry run without executing
(default is "$LOGFILE") -e, --export-only Just export (and add the ChangeLog, if requested),
-m, --mail=<address> Mail a failure report to the given address (and do not build or test the source distribution
include a log file snippet, if logging is enabled) -h, --help Print this help message
Note that the \@-Sign needs to be quoted! -l, --log[=<filename>] Write a log file [to <filename>]
Example: --mail=user\\\@domain.com (default is "$LOGFILE")
-r, --revision=<rev> Export the tree as of revision <rev> -m, --mail=<address> Mail a failure report to the given address (and
(default is up to the latest revision) include a log file snippet, if logging is enabled)
-s, --skip-check Skip checking the distribution with "make distcheck" Note that the \@-Sign needs to be quoted!
--skip-manual Skip updating the manual from the mysqldoc tree Example: --mail=user\\\@domain.com
--suffix=<suffix> Append <suffix> to the version number in configure.in. -r, --revision=<rev> Export the tree as of revision <rev>
Using the special suffix "YMD" will add the current (default is up to the latest revision)
date as the suffix (e.g. "-20020518"). -s, --skip-check Skip checking the distribution with "make distcheck"
-t, --test Run the test suite after build --skip-manual Skip updating the manual from the mysqldoc tree
-v, --verbose Be verbose --suffix=<suffix> Append <suffix> to the version number in
configure.in. Using the special suffix "YMD" will
add the current date as the suffix
(e.g. "-20020518").
-t, --test Run the test suite after build
-v, --verbose Be verbose
Example: Example:
......
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