Commit cfa37325 authored by unknown's avatar unknown

New option for Bootstrap: -w | --win-dist to create Windows source package


Build-tools/Bootstrap:
  Add --win-dist option to create Windows source package
scripts/Makefile.am:
  Add make_win_src_distribution to CLEANFILES
parent 409516a5
...@@ -43,6 +43,7 @@ $opt_suffix= ""; ...@@ -43,6 +43,7 @@ $opt_suffix= "";
$opt_test= undef; $opt_test= undef;
$opt_skip_check= undef; $opt_skip_check= undef;
$opt_skip_manual= undef; $opt_skip_manual= undef;
$opt_win_dist= undef;
$version= "unknown"; $version= "unknown";
$major=$minor=$release=0; $major=$minor=$release=0;
...@@ -62,7 +63,8 @@ GetOptions( ...@@ -62,7 +63,8 @@ GetOptions(
"skip-manual", "skip-manual",
"suffix=s", "suffix=s",
"test|t", "test|t",
"verbose|v" "verbose|v",
"win-dist|w"
) || print_help(""); ) || print_help("");
# #
...@@ -303,7 +305,21 @@ $command= "make dist"; ...@@ -303,7 +305,21 @@ $command= "make dist";
&run_command($command, "make dist failed!"); &run_command($command, "make dist failed!");
# #
# Run "make distcheck" to verify the source archive # Package the Windows source
#
if ($opt_win_dist)
{
&logger ("Creating Windows source package");
chdir("scripts");
$command= "make make_win_src_distribution";
&run_command($command, "make make_win_src_distribution failed!");
chdir("..");
$command= "./scripts/make_win_src_distibution";
&run_command($command, "make_win_src_distribution failed!");
}
#
# Run "make distcheck" to verify the source archive
# #
if (!$opt_skip_check) if (!$opt_skip_check)
{ {
...@@ -330,7 +346,7 @@ sub print_help ...@@ -330,7 +346,7 @@ sub print_help
print "ERROR: $message\n"; print "ERROR: $message\n";
} }
print <<EOF; print <<EOF;
Usage: Bootstrap [options] <bk repository> Usage: Bootstrap [options] <bk repository>
Checks out (exports) a clear-text version of the given local BitKeeper Checks out (exports) a clear-text version of the given local BitKeeper
...@@ -376,6 +392,7 @@ Options: ...@@ -376,6 +392,7 @@ Options:
(e.g. "-20020518"). (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
-w, --win-dist Also make Windows source distribution
Example: Example:
......
...@@ -65,6 +65,7 @@ pkgdata_DATA = make_binary_distribution ...@@ -65,6 +65,7 @@ pkgdata_DATA = make_binary_distribution
# failures with it. # failures with it.
CLEANFILES = @server_scripts@ \ CLEANFILES = @server_scripts@ \
make_binary_distribution \ make_binary_distribution \
make_win_src_distribution \
msql2mysql \ msql2mysql \
mysql_config \ mysql_config \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \
......
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