Add support for building on win32 and sending mail using 'blat'.

This commit is contained in:
seawood%netscape.com 2001-12-21 06:52:19 +00:00
Родитель e616ef0977
Коммит 404a346907
2 изменённых файлов: 29 добавлений и 5 удалений

Просмотреть файл

@ -21,7 +21,7 @@ use File::Basename; # for basename();
use Config; # for $Config{sig_name} and $Config{sig_num} use Config; # for $Config{sig_name} and $Config{sig_num}
$::UtilsVersion = '$Revision: 1.132 $ '; $::UtilsVersion = '$Revision: 1.133 $ ';
package TinderUtils; package TinderUtils;
@ -195,6 +195,9 @@ sub GetSystemInfo {
chomp($os_ver); chomp($os_ver);
$os_ver =~ s/^([0-9])([0-9]*)$/$1.$2/; $os_ver =~ s/^([0-9])([0-9]*)$/$1.$2/;
} }
if ($Settings::OS eq 'WINNT') {
$host =~ tr/A-Z/a-z/;
}
$Settings::BuildName = "$host $Settings::OS ${os_ver} $build_type"; $Settings::BuildName = "$host $Settings::OS ${os_ver} $build_type";
@ -429,6 +432,11 @@ sub SetupPath {
} }
} }
} }
if ($Settings::OS eq 'WINNT') {
$Settings::use_blat = 1;
$Settings::Compiler = 'cl';
}
$Settings::ConfigureArgs .= '--cache-file=/dev/null'; $Settings::ConfigureArgs .= '--cache-file=/dev/null';
# Pass $ObjDir along to the build system. # Pass $ObjDir along to the build system.
@ -474,8 +482,8 @@ sub adjust_start_time {
sub mail_build_started_message { sub mail_build_started_message {
my ($start_time) = @_; my ($start_time) = @_;
my $msg_log = "build_start_msg.tmp";
open LOG, "|$Settings::mail $Settings::Tinderbox_server"; open LOG, ">$msg_log";
PrintUsage() if $Settings::BuildTree =~ /^\s+$/i; PrintUsage() if $Settings::BuildTree =~ /^\s+$/i;
@ -491,6 +499,14 @@ sub mail_build_started_message {
print_log "\n"; print_log "\n";
close LOG; close LOG;
if ($Settings::blat ne "" && $Settings::use_blat) {
system("$Settings::blat $msg_log -t $Settings::Tinderbox_server");
} else {
system "$Settings::mail $Settings::Tinderbox_server "
." < $msg_log";
}
unlink "$msg_log";
} }
sub mail_build_finished_message { sub mail_build_finished_message {
@ -537,8 +553,12 @@ sub mail_build_finished_message {
unlink($logfile); unlink($logfile);
if ($Settings::ReportStatus and $Settings::ReportFinalStatus) { if ($Settings::ReportStatus and $Settings::ReportFinalStatus) {
system "$Settings::mail $Settings::Tinderbox_server " if ($Settings::blat ne "" && $Settings::use_blat) {
." < $logfile.last"; system("$Settings::blat $logfile.last -t $Settings::Tinderbox_server");
} else {
system "$Settings::mail $Settings::Tinderbox_server "
." < $logfile.last";
}
} }
} }

Просмотреть файл

@ -63,6 +63,10 @@ $mail = '/bin/mail';
$CVS = 'cvs -q'; $CVS = 'cvs -q';
$CVSCO = 'checkout -P'; $CVSCO = 'checkout -P';
# win32 usually doesn't have /bin/mail
$blat = 'c:/nstools/bin/blat';
$use_blat = 0;
# Set moz_cvsroot to something like: # Set moz_cvsroot to something like:
# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot # :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot # :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot