mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed a bug in the timestamp mechanism and turned it off by default, turned CVS compression off by default, and made the appropriate flag changes.

This commit is contained in:
briano%netscape.com 1999-04-07 00:29:45 +00:00
Родитель e6fca2317e
Коммит ba5e42586d
2 изменённых файлов: 34 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
tools/tinderbox/build-moz-ports.pl
Просмотреть файл

@ -6,7 +6,7 @@ use Sys::Hostname;
use POSIX "sys_wait_h"; use POSIX "sys_wait_h";
use Cwd; use Cwd;
$Version = '$Revision: 1.16 $'; $Version = '$Revision: 1.17 $';
sub InitVars { sub InitVars {
# PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@ -18,7 +18,7 @@ sub InitVars {
$BuildOnce = 0; # Build once, don't send results to server $BuildOnce = 0; # Build once, don't send results to server
$BuildClassic = 0; # Build classic source $BuildClassic = 0; # Build classic source
$RunTest = 1; # Run the smoke test on successful build, or not $RunTest = 1; # Run the smoke test on successful build, or not
$UseTimeStamp = 1; # Use the CVS 'pull-by-timestamp' option, or not $UseTimeStamp = 0; # Use the CVS 'pull-by-timestamp' option, or not
# Relative path to binary # Relative path to binary
$BinaryName{'x'} = 'mozilla-export'; $BinaryName{'x'} = 'mozilla-export';
@ -31,7 +31,7 @@ sub InitVars {
$Make = 'gmake'; # Must be GNU make $Make = 'gmake'; # Must be GNU make
$MakeOverrides = ''; $MakeOverrides = '';
$mail = '/bin/mail'; $mail = '/bin/mail';
$CVS = 'cvs -q -z3'; $CVS = 'cvs -q';
$CVSCO = 'checkout -P'; $CVSCO = 'checkout -P';
# Set these proper values for your tinderbox server # Set these proper values for your tinderbox server
@ -340,12 +340,6 @@ sub GetSystemInfo {
} else { } else {
$logfile = "${DirName}.log"; $logfile = "${DirName}.log";
} }
if ( $UseTimeStamp ) {
$BuildStart = `date '+%D %H:%M'`;
chop($BuildStart);
$CVSCO .= " -D '$BuildStart'";
}
} }
sub BuildIt { sub BuildIt {
@ -599,7 +593,7 @@ sub BuildIt {
$Output =~ s/\n//g; $Output =~ s/\n//g;
print OUTLOG "$Output\n"; print OUTLOG "$Output\n";
$q++; $q++;
} #EndFor }
} #EndWhile } #EndWhile
@ -622,6 +616,12 @@ sub CVSTime {
($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg); ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
$mon++; # month is 0 based. $mon++; # month is 0 based.
if ( $UseTimeStamp ) {
$BuildStart = `date '+%D %H:%M'`;
chop($BuildStart);
$CVSCO .= " -D '$BuildStart'";
}
sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute ); sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
} }
@ -695,6 +695,9 @@ sub ParseArgs {
$BuildDepend = 0; $BuildDepend = 0;
$manArg++; $manArg++;
} }
elsif ( $ARGV[$i] eq '--compress' ) {
$CVS = 'cvs -q -z3';
}
elsif ( $ARGV[$i] eq '--depend' ) { elsif ( $ARGV[$i] eq '--depend' ) {
$BuildDepend = 1; $BuildDepend = 1;
$manArg++; $manArg++;
@ -702,9 +705,6 @@ sub ParseArgs {
elsif ( $ARGV[$i] eq '--help' || $ARGV[$i] eq '-h' ) { elsif ( $ARGV[$i] eq '--help' || $ARGV[$i] eq '-h' ) {
$PrintUsage; $PrintUsage;
} }
elsif ( $ARGV[$i] eq '--nocompress' ) {
$CVS = 'cvs -q';
}
elsif ( $ARGV[$i] eq '--nodeps' ) { elsif ( $ARGV[$i] eq '--nodeps' ) {
$ConfigureArgs .= '--enable-md=no '; $ConfigureArgs .= '--enable-md=no ';
} }
@ -714,9 +714,6 @@ sub ParseArgs {
elsif ( $ARGV[$i] eq '--notest' ) { elsif ( $ARGV[$i] eq '--notest' ) {
$RunTest = 0; $RunTest = 0;
} }
elsif ( $ARGV[$i] eq '--notime' ) {
$UseTimeStamp = 0;
}
elsif ( $ARGV[$i] eq '--once' ) { elsif ( $ARGV[$i] eq '--once' ) {
$BuildOnce = 1; $BuildOnce = 1;
} }
@ -727,6 +724,9 @@ sub ParseArgs {
&PrintUsage; &PrintUsage;
} }
} }
elsif ( $ARGV[$i] eq '--timestamp' ) {
$UseTimeStamp = 1;
}
elsif ( $ARGV[$i] eq '-t' ) { elsif ( $ARGV[$i] eq '-t' ) {
$i++; $i++;
$BuildTree = $ARGV[$i]; $BuildTree = $ARGV[$i];
@ -754,7 +754,7 @@ sub ParseArgs {
} }
sub PrintUsage { sub PrintUsage {
die "usage: $0 --depend | --clobber [ -v | --version ] [ --once --classic --noreport --notest -tag TREETAG -t TREENAME ]\n"; die "usage: $0 --depend | --clobber [ --once --classic --compress --noreport --notest --timestamp -tag TREETAG -t TREENAME --version ]\n";
} }
sub PrintEnv { sub PrintEnv {

34
tools/tinderbox/build-moz-smoke.pl
Просмотреть файл

@ -6,7 +6,7 @@ use Sys::Hostname;
use POSIX "sys_wait_h"; use POSIX "sys_wait_h";
use Cwd; use Cwd;
$Version = '$Revision: 1.16 $'; $Version = '$Revision: 1.17 $';
sub InitVars { sub InitVars {
# PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@ -18,7 +18,7 @@ sub InitVars {
$BuildOnce = 0; # Build once, don't send results to server $BuildOnce = 0; # Build once, don't send results to server
$BuildClassic = 0; # Build classic source $BuildClassic = 0; # Build classic source
$RunTest = 1; # Run the smoke test on successful build, or not $RunTest = 1; # Run the smoke test on successful build, or not
$UseTimeStamp = 1; # Use the CVS 'pull-by-timestamp' option, or not $UseTimeStamp = 0; # Use the CVS 'pull-by-timestamp' option, or not
# Relative path to binary # Relative path to binary
$BinaryName{'x'} = 'mozilla-export'; $BinaryName{'x'} = 'mozilla-export';
@ -31,7 +31,7 @@ sub InitVars {
$Make = 'gmake'; # Must be GNU make $Make = 'gmake'; # Must be GNU make
$MakeOverrides = ''; $MakeOverrides = '';
$mail = '/bin/mail'; $mail = '/bin/mail';
$CVS = 'cvs -q -z3'; $CVS = 'cvs -q';
$CVSCO = 'checkout -P'; $CVSCO = 'checkout -P';
# Set these proper values for your tinderbox server # Set these proper values for your tinderbox server
@ -340,12 +340,6 @@ sub GetSystemInfo {
} else { } else {
$logfile = "${DirName}.log"; $logfile = "${DirName}.log";
} }
if ( $UseTimeStamp ) {
$BuildStart = `date '+%D %H:%M'`;
chop($BuildStart);
$CVSCO .= " -D '$BuildStart'";
}
} }
sub BuildIt { sub BuildIt {
@ -599,7 +593,7 @@ sub BuildIt {
$Output =~ s/\n//g; $Output =~ s/\n//g;
print OUTLOG "$Output\n"; print OUTLOG "$Output\n";
$q++; $q++;
} #EndFor }
} #EndWhile } #EndWhile
@ -622,6 +616,12 @@ sub CVSTime {
($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg); ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
$mon++; # month is 0 based. $mon++; # month is 0 based.
if ( $UseTimeStamp ) {
$BuildStart = `date '+%D %H:%M'`;
chop($BuildStart);
$CVSCO .= " -D '$BuildStart'";
}
sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute ); sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
} }
@ -695,6 +695,9 @@ sub ParseArgs {
$BuildDepend = 0; $BuildDepend = 0;
$manArg++; $manArg++;
} }
elsif ( $ARGV[$i] eq '--compress' ) {
$CVS = 'cvs -q -z3';
}
elsif ( $ARGV[$i] eq '--depend' ) { elsif ( $ARGV[$i] eq '--depend' ) {
$BuildDepend = 1; $BuildDepend = 1;
$manArg++; $manArg++;
@ -702,9 +705,6 @@ sub ParseArgs {
elsif ( $ARGV[$i] eq '--help' || $ARGV[$i] eq '-h' ) { elsif ( $ARGV[$i] eq '--help' || $ARGV[$i] eq '-h' ) {
$PrintUsage; $PrintUsage;
} }
elsif ( $ARGV[$i] eq '--nocompress' ) {
$CVS = 'cvs -q';
}
elsif ( $ARGV[$i] eq '--nodeps' ) { elsif ( $ARGV[$i] eq '--nodeps' ) {
$ConfigureArgs .= '--enable-md=no '; $ConfigureArgs .= '--enable-md=no ';
} }
@ -714,9 +714,6 @@ sub ParseArgs {
elsif ( $ARGV[$i] eq '--notest' ) { elsif ( $ARGV[$i] eq '--notest' ) {
$RunTest = 0; $RunTest = 0;
} }
elsif ( $ARGV[$i] eq '--notime' ) {
$UseTimeStamp = 0;
}
elsif ( $ARGV[$i] eq '--once' ) { elsif ( $ARGV[$i] eq '--once' ) {
$BuildOnce = 1; $BuildOnce = 1;
} }
@ -727,6 +724,9 @@ sub ParseArgs {
&PrintUsage; &PrintUsage;
} }
} }
elsif ( $ARGV[$i] eq '--timestamp' ) {
$UseTimeStamp = 1;
}
elsif ( $ARGV[$i] eq '-t' ) { elsif ( $ARGV[$i] eq '-t' ) {
$i++; $i++;
$BuildTree = $ARGV[$i]; $BuildTree = $ARGV[$i];
@ -754,7 +754,7 @@ sub ParseArgs {
} }
sub PrintUsage { sub PrintUsage {
die "usage: $0 --depend | --clobber [ -v | --version ] [ --once --classic --noreport --notest -tag TREETAG -t TREENAME ]\n"; die "usage: $0 --depend | --clobber [ --once --classic --compress --noreport --notest --timestamp -tag TREETAG -t TREENAME --version ]\n";
} }
sub PrintEnv { sub PrintEnv {