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,6 +338,9 @@ archive is being created. ...@@ -329,6 +338,9 @@ archive is being created.
Options: Options:
-b, --build-command=<cmd> Use <cmd> to compile the sources before packing
the distribution.
(default is "$build_command")
-c, --changelog[=<rev>] Add a ChangeLog [down to revision <rev>] -c, --changelog[=<rev>] Add a ChangeLog [down to revision <rev>]
This will automatically be included in the source This will automatically be included in the source
distribution. To get a ChangeLog down to the last distribution. To get a ChangeLog down to the last
...@@ -338,7 +350,8 @@ Options: ...@@ -338,7 +350,8 @@ Options:
in the target directory instead of renaming it. in the target directory instead of renaming it.
-d, --directory=<dir> Specify the target directory -d, --directory=<dir> Specify the target directory
(default is "$opt_directory") (default is "$opt_directory")
--docdir=<dir> Use the MySQL documentation BK tree located in in <dir> --docdir=<dir> Use the MySQL documentation BK tree located
in <dir>
(default is "$opt_docdir") (default is "$opt_docdir")
--dry-run Dry run without executing --dry-run Dry run without executing
-e, --export-only Just export (and add the ChangeLog, if requested), -e, --export-only Just export (and add the ChangeLog, if requested),
...@@ -354,9 +367,10 @@ Options: ...@@ -354,9 +367,10 @@ Options:
(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"
--skip-manual Skip updating the manual from the mysqldoc tree --skip-manual Skip updating the manual from the mysqldoc tree
--suffix=<suffix> Append <suffix> to the version number in configure.in. --suffix=<suffix> Append <suffix> to the version number in
Using the special suffix "YMD" will add the current configure.in. Using the special suffix "YMD" will
date as the suffix (e.g. "-20020518"). add the current date as the suffix
(e.g. "-20020518").
-t, --test Run the test suite after build -t, --test Run the test suite after build
-v, --verbose Be verbose -v, --verbose Be verbose
......
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