database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

logger.pm, Bootstrap:

Browse Source 
Updates for output enhanced Bootstrap
This commit is contained in:
mwagner@here.mwagner.org
2004-06-24 12:22:48 -05:00
parent b88e647611
commit 81c0732a45
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Build-tools/Bootstrap
View File

@@ -46,6 +46,7 @@ $opt_test= undef;
$opt_skip_check= undef; $opt_skip_check= undef;
$opt_skip_manual= undef; $opt_skip_manual= undef;
$opt_win_dist= undef; $opt_win_dist= undef;
$opt_quiet= undef;
$version= "unknown"; $version= "unknown";
$major=$minor=$release=0; $major=$minor=$release=0;
@@ -67,7 +68,8 @@ GetOptions(
"suffix=s", "suffix=s",
"test|t", "test|t",
"verbose|v", "verbose|v",
"win-dist|w" "win-dist|w",
"quiet|q",
) || print_help(""); ) || print_help("");
# #
@@ -99,8 +101,6 @@ if (defined $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!");
$subject= "Bootstrap of $REPO failed" if $opt_mail;
&logger("Starting build"); &logger("Starting build");
&abort("The directory \"$REPO\" could not be found!") if (!-d $REPO); &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
&logger("Using $REPO as the BK parent repository"); &logger("Using $REPO as the BK parent repository");
@@ -306,7 +306,7 @@ if (!$opt_dry_run)
# #
# Now build the source distribution # Now build the source distribution
# #
&logger("Compiling"); &logger("Compiling...");
$command= $build_command; $command= $build_command;
&run_command($command, "Compilation failed!"); &run_command($command, "Compilation failed!");
@@ -403,6 +403,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
-q, --quiet Be quiet
-p, --pull Update the source BK trees before building -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)

15
Build-tools/logger.pm
View File

@@ -5,7 +5,10 @@
# #
sub logger sub logger
{ {
my $message=$_[0]; my $message= $_[0];
my $cmnd= $_[1];
print $message . "\n" if !$opt_quiet && !$opt_verbose && !$cmnd;
print timestamp() . " " . $message . "\n" if $opt_verbose; print timestamp() . " " . $message . "\n" if $opt_verbose;
if (defined $opt_log && !$opt_dry_run) if (defined $opt_log && !$opt_dry_run)
{ {
@@ -30,9 +33,12 @@ sub run_command
} }
else else
{ {
&logger($command); &logger($command, 1);
$command.= " >> $LOGFILE 2>&1" if defined $opt_log;
$command.= " > /dev/null" if (!$opt_verbose && !$opt_log); $command.= ';' unless ($command =~ m/^.*;$/);
$command =~ s/;/ >> $LOGFILE 2>&1;/g if defined $opt_log;
$command =~ s/;/ > \/dev\/null;/g if (!$opt_verbose && !$opt_log);
system($command) == 0 or &abort("$errormsg\n"); system($command) == 0 or &abort("$errormsg\n");
} }
} }
@@ -47,6 +53,7 @@ sub abort
{ {
my $message= $_[0]; my $message= $_[0];
my $messagefile; my $messagefile;
my $subject= "Bootstrap of $REPO failed" if $opt_mail;
$message= "ERROR: " . $message; $message= "ERROR: " . $message;
&logger($message); &logger($message);