diff --git a/mozilla/tools/tinderbox/build-moz-smoke.pl b/mozilla/tools/tinderbox/build-moz-smoke.pl
deleted file mode 100755
index 83b55c4cd22..00000000000
--- a/mozilla/tools/tinderbox/build-moz-smoke.pl
+++ /dev/null
@@ -1,898 +0,0 @@
-#!/usr/bin/perl
-
-require 5.000;
-
-use Sys::Hostname;
-use POSIX "sys_wait_h";
-use Cwd;
-
-$Version = '$Revision: 1.35 $';
-
-sub InitVars {
-    # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-    $BuildAdministrator = "$ENV{'USER'}\@$ENV{'HOST'}";
-
-    # Default values of cmdline opts (1==on, 0==off)
-    $BuildDepend = 1;		# Depend or Clobber
-    $BuildNSCommercial = 0;	# Build Netscape commercial client (internal only)
-    $BuildOnce = 0;		# Build once, don't send results to server
-    $ReportStatus = 1;		# Send results to server, or not
-    $RunTest = 1;		# Run the smoke test on successful build, or not
-    $UseFullCircle = 0;		# Enable FullCircle Talkback debugging, or not
-    $UseMotif = 0;		# Build using Motif instead of GTK+, or not
-    $UseObjDir = 1;		# Use a separate object dir, or build in the source tree
-    $UseTimeStamp = 0;		# Use the CVS 'pull-by-timestamp' option, or not
-
-    # Set these to what makes sense for your system
-    $cpus = 1;
-    $Make = 'gmake'; # Must be GNU make
-    $MakeOverrides = '';
-    $mail = '/bin/mail';
-    $CVS = 'cvs -q';
-    $CVSCO = 'checkout -P';
-
-    # You'll need to change these to suit your machine's needs
-    $BaseDir = '/builds/tinderbox/SeaMonkey';
-    $NSPRDir = '/builds/tinderbox/SeaMonkey/nspr';
-    $DisplayServer = 'costarica.mcom.com:0.0';
-    $FullCircleDir = '/usr/local/lib';	# If you even have it, which is very unlikely.
-
-    # These shouldn't really need to be changed
-    $BinaryName = '/dist/bin/mozilla-bin';
-    $BuildName = '';
-    $BuildObjName = '';
-    $BuildSleep = 10;  # Minimum wait period from start of build to start of next build in minutes.
-    $BuildStart = '';
-    $BuildTag = '';
-    $BuildTree = 'MozillaTest';  # Your build results will be displayed on this Tinderbox page.
-    $Compiler = 'gcc';
-    $ConfigureEnvArgs = '';
-    $ConfigureArgs = '--with-nspr=' . $NSPRDir . ' --cache-file=/dev/null ';
-    $ConfigGuess = './build/autoconf/config.guess';
-    $FE = 'mozilla-bin'; 
-    $Logfile = '${BuildDir}.log';
-    $NSCommModule = 'CommercialClient50All';
-    $NSPRArgs = 'DIST=' . $NSPRDir . ' MOZILLA_CLIENT=1 NSDISTMODE=copy NO_MDUPDATE=1 ';
-    $ShellOverride = ''; # Only used if the default shell is too stupid
-    $Tinderbox_server = 'tinderbox-daemon\@cvs-mirror.mozilla.org';
-    $TopLevel = '.';
-    $Topsrcdir = 'mozilla';
-}
-
-sub SetupEnv {
-    my($Path, $comptmp);
-    $comptmp = '';
-    $Path = $ENV{PATH};
-    print "Path before: $Path\n";
-
-    umask(0);
-    $ENV{"CVSROOT"} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
-    $ENV{"DISPLAY"} = $DisplayServer;
-    $ENV{"TMPDIR"} = '.';
-
-    if ( $OS eq 'AIX' ) {
-	$ENV{'PATH'} = '/builds/local/bin:' . $ENV{'PATH'} . ':/usr/lpp/xlC/bin';
-	$ConfigureArgs .= '--enable-static --x-includes=/usr/include/X11 --x-libraries=/usr/lib';
-	$ConfigureEnvArgs = 'CC=xlC_r CXX=xlC_r';
-	$Compiler = 'xlC_r';
-	$NSPRArgs .= 'NS_USE_NATIVE=1 USE_PTHREADS=1';
-	if ( $OSVer eq '4.3' ) {
-	    $ENV{'PATH'} = '/usr/wpc/bin:' . $ENV{'PATH'};
-	    $ENV{"CC"} = "xlc_r";
-	    $ENV{"CXX"} = " xlC_r";
-	    $ENV{"CFLAGS"} = "-DAIX -DAIX4_3";
-	    $ENV{"LDFLAGS"} = "-brtl -bso";
-	    $ENV{"CXXFLAGS"} = "-DAIX -DAIX4_3";
-	    $ConfigureEnvArgs = 'CFLAGS="-DAIX -DAIX4_3" CXXFLAGS="-DAIX -DAIX4_3" LDFLAGS="-brtl -bso"';
-	}
-    }
-
-    if ( $OS eq 'BSD_OS' ) {
-	$ENV{'PATH'} = '/usr/contrib/bin:/bin:/usr/bin:' . $ENV{'PATH'};
-	if ( $OSVer ne '4.0' ) {
-	    $ConfigureArgs .= '--disable-shared --enable-static --disable-debug --enable-optimize';
-	    $ConfigureEnvArgs = 'CC=shlicc2 CXX=shlicc2';
-	    $Compiler = 'shlicc2';
-	    $MakeOverrides = 'CPP_PROG_LINK=0 CCF=shlicc2'; # because ld dies if it encounters -include
-	}
-	$mail = '/usr/ucb/mail';
-	$NSPRArgs .= 'NS_USE_GCC=1 NS_USE_NATIVE=';
-    }
-
-    if ( $OS eq 'FreeBSD' ) {
-	$ENV{'PATH'} = '/bin:/usr/bin:' . $ENV{'PATH'};
-	if ( $ENV{'HOST'} eq 'angelus.mcom.com' ) {
-	    $ConfigureEnvArgs = 'CC=egcc CXX=eg++';
-	    $Compiler = 'egcc';
-	}
-	$mail = '/usr/bin/mail';
-    }
-
-    if ( $OS eq 'HP-UX' ) {
-	$ENV{'PATH'} = '/opt/ansic/bin:/opt/aCC/bin:/builds/local/bin:' . $ENV{'PATH'};
-	$ConfigureArgs .= '--disable-gtktest --x-includes=/usr/include/X11 --x-libraries=/usr/lib';
-	$ConfigureEnvArgs = 'CC="cc -Ae" CXX="aCC -ext"';
-	$Compiler = 'cc/aCC';
-	# Use USE_PTHREADS=1 instead of CLASSIC_NSPR if you've got DCE installed.
-	$NSPRArgs .= 'NS_USE_NATIVE=1 CLASSIC_NSPR=1';
-    }
-
-    if ( $OS eq 'IRIX' ) {
-	$ENV{'PATH'} = $BaseDir . '/' . $DirName . '/mozilla/build:/opt/bin:/builds/local/bin:' . $ENV{'PATH'};
-	if ( $OSVer eq '5.2' ) {
-	    $ConfigureEnvArgs = 'CC=cc CXX="hcpp CC"';
-	} else {
-	    $ConfigureEnvArgs = 'CC=cc CXX=CC';
-	}
-	$Compiler = 'cc/CC';
-	$NSPRArgs .= 'NS_USE_NATIVE=1';
-	if ( $OSVerMajor eq '6' ) {
-	    $NSPRArgs .= ' USE_PTHREADS=1 USE_N32=1';
-	    $ConfigureEnvArgs .= ' CFLAGS="-n32 -O" CXXFLAGS="-n32 -O"';
-	}
-    }
-
-    if ( $OS eq 'Linux' ) {
-	# This is utterly lame....
-	if ( $ENV{'HOST'} eq 'eyeball.mcom.com' ) {
-	    $NSPRArgs .= 'USE_PTHREADS=1';
-	}
-        print "NSPRArgs: $NSPRArgs\n";
-    }
-
-    if ( $OS eq 'NetBSD' ) {
-	$ENV{'PATH'} = '/bin:/usr/bin:' . $ENV{'PATH'};
-	$ConfigureEnvArgs = 'CC=egcc CXX=eg++';
-	$Compiler = 'egcc';
-	$mail = '/usr/bin/mail';
-    }
-
-    if ( $OS eq 'OpenBSD' ) {
-	$ENV{'PATH'} = '/bin:/usr/bin:' . $ENV{'PATH'};
-	$mail = '/usr/bin/mail';
-    }
-
-    if ( $OS eq 'OpenServer' ) {
-	$ENV{'PATH'} = $BaseDir . '/' . $DirName . '/mozilla/build:/usr/local/bin:' . $ENV{'PATH'};
-	$ConfigureArgs .= '--disable-shared --enable-static';
-	$ConfigureEnvArgs = 'CC="gcc -belf -static" CXX="g++ -belf -static"';
-	$NSPRArgs .= 'NS_USE_NATIVE=1';
-    }
-
-    if ( $OS eq 'OSF1' ) {
-	$ENV{'PATH'} = '/usr/gnu/bin:' . $ENV{'PATH'};
-	$ConfigureEnvArgs = 'CC="cc -readonly_strings" CXX="cxx"';
-	$Compiler = 'cc/cxx';
-	$MakeOverrides = 'SHELL=/usr/bin/ksh';
-	$NSPRArgs .= 'NS_USE_NATIVE=1 USE_PTHREADS=1';
-	$ShellOverride = '/usr/bin/ksh';
-    }
-
-    if ( $OS eq 'QNX' ) {
-	$ENV{'PATH'} = '/usr/local/bin:' . $ENV{'PATH'};
-	$ConfigureArgs .= '--disable-shared --enable-static --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib';
-	$ConfigureEnvArgs = 'CC=cc CXX=cc LIBS="-lunix" CONFIG_SHELL="/usr/local/bin/bash"';
-	$Compiler = 'cc';
-	$ShellOverride = '/usr/local/bin/bash';
-	$mail = '/usr/bin/sendmail';
-    }
-
-    if ( $OS eq 'SINIX' ) {
-	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
-    }
-
-    if ( $OS eq 'SunOS' ) {
-	if ( $OSVerMajor eq '4' ) {
-	    $ENV{'PATH'} = '/usr/gnu/bin:/usr/local/sun4/bin:/usr/bin:' . $ENV{'PATH'};
-	    $ConfigureArgs .= '--x-includes=/home/motif/usr/include/X11 --x-libraries=/home/motif/usr/lib';
-	    $ConfigureEnvArgs = 'CC=egcc CXX=eg++';
-	    $Compiler = 'egcc';
-	} else {
-	    $ENV{'PATH'} = '/opt/usr/local/bin:/usr/ccs/bin:' . $ENV{'PATH'};
-	}
-	if ( $CPU eq 'i86pc' ) {
-	    $ENV{'PATH'} = '/opt/gnu/bin:' . $ENV{'PATH'};
-	    $ConfigureEnvArgs = 'CC=egcc CXX=eg++';
-	    $Compiler = 'egcc';
-	    # This may just be an NSPR bug, but if USE_PTHREADS is defined, then
-	    # _PR_HAVE_ATOMIC_CAS gets defined (erroneously?) and libnspr doesn't work.
-	    $NSPRArgs .= 'CLASSIC_NSPR=1 NS_USE_GCC=1 NS_USE_NATIVE=';
-	} else {
-	    # This is utterly lame....
-	    if ( $ENV{'HOST'} eq 'fugu' ) {
-		$ENV{'PATH'} = '/tools/ns/workshop/bin:/usrlocal/bin:' . $ENV{'PATH'};
-		$ConfigureArgs .= '--disable-debug --enable-optimize';
-		$ConfigureEnvArgs = 'CC=cc CXX=CC';
-		$comptmp = `cc -V 2>&1 | head -1`;
-		chop($comptmp);
-		$Compiler = "cc/CC \($comptmp\)";
-		$NSPRArgs .= 'BUILD_OPT=1 NS_USE_NATIVE=1';
-	    } elsif ( $ENV{'HOST'} eq 'nebiros' || $ENV{'HOST'} eq 'liekkio' ) {
-		$ENV{'PATH'} = '/tools/ns/workshop-5.0/bin:' . $ENV{'PATH'};
-		$ConfigureEnvArgs = 'CC=cc CXX=CC';
-		$comptmp = `cc -V 2>&1 | head -1`;
-		chop($comptmp);
-		$Compiler = "cc/CC \($comptmp\)";
-		$NSPRArgs .= 'NS_USE_NATIVE=1';
-	    } else {
-		$NSPRArgs .= 'NS_USE_GCC=1 NS_USE_NATIVE=';
-	    }
-	    if ( $OSVerMajor eq '5' && $OSVer ne '5.3' ) {
-		$NSPRArgs .= ' USE_PTHREADS=1';
-	    }
-	}
-    }
-
-    if ( $OS eq 'UnixWare' ) {
-	$ENV{'PATH'} = '/usr/local/bin:/usr/ccs/bin:' . $ENV{'PATH'} . ':/usr/ucb';
-	$ConfigureArgs .= '--x-includes=/usr/X/include --x-libraries=/usr/X/lib';
-	$NSPRArgs .= 'NS_USE_NATIVE=1';
-    }
-
-    $Path = $ENV{PATH};
-    print "Path After: $Path\n";
-}
-
-sub FinalizeLDLibPath {
-    if ( $_[0] eq 'ns' ) {
-	$ENV{"LD_LIBRARY_PATH"} = $BaseDir . '/' . $DirName . '/ns/' . $BuildObjName . '/dist/bin:' . $BaseDir . '/' . $DirName . '/ns/' . $BuildObjName . '/dist/bin/Cool:' . $NSPRDir . '/lib:/usr/lib/png:/usr/local/lib';
-    } else {
-	$ENV{"LD_LIBRARY_PATH"} = $BaseDir . '/' . $DirName . '/mozilla/' . $BuildObjName . '/dist/bin:' . $NSPRDir . '/lib:/usr/lib/png:/usr/local/lib';
-    }
-
-    if ( $OS eq 'HP-UX' ) {
-	$ENV{'LPATH'} = '/usr/lib:' . $ENV{'LD_LIBRARY_PATH'} . ':/builds/local/lib';
-	$ENV{'SHLIB_PATH'} = $ENV{'LPATH'};
-    }
-    if ( $OS eq 'IRIX' ) {
-	$ENV{'LD_LIBRARY_PATH'} .= ':/opt/lib:/builds/local/lib';
-	$ENV{'LD_LIBRARYN32_PATH'} = $ENV{'LD_LIBRARY_PATH'};
-    }
-    if ( $OS eq 'NetBSD' || $OS eq 'OpenBSD' ) {
-	$ENV{'LD_LIBRARY_PATH'} .= ':/usr/X11R6/lib';
-    }
-    if ( $OS eq 'OSF1' ) {
-	$ENV{'LD_LIBRARY_PATH'} .= ':/usr/gnu/lib';
-    }
-    if ( $OS eq 'QNX' ) {
-	$ENV{'LD_LIBRARY_PATH'} .= ':/usr/X11/lib';
-    }
-    if ( $OS eq 'SunOS' ) {
-	if ( $OSVerMajor eq '4' ) {
-	    $ENV{'LD_LIBRARY_PATH'} = '/home/motif/usr/lib:' . $ENV{'LD_LIBRARY_PATH'};
-	} else {
-	    if ( $UseMotif ) {
-		$ENV{'LD_LIBRARY_PATH'} = '/usr/dt/lib:/usr/openwin/lib:' . $ENV{'LD_LIBRARY_PATH'};
-	    }
-	}
-	if ( $CPU eq 'i86pc' ) {
-	    $ENV{'LD_LIBRARY_PATH'} .= ':/opt/gnu/lib';
-	} else {
-	    $ENV{'LD_LIBRARY_PATH'} = '/opt/usr/local/lib:' . $ENV{'LD_LIBRARY_PATH'};
-	    # This is utterly lame....
-	    if ( $ENV{'HOST'} eq 'fugu' ) {
-		$ENV{'LD_LIBRARY_PATH'} = '/tools/ns/workshop/lib:/usrlocal/lib:' . $ENV{'LD_LIBRARY_PATH'};
-	    }
-	    if ( $ENV{'HOST'} eq 'nebiros' || $ENV{'HOST'} eq 'liekkio' ) {
-		$ENV{'LD_LIBRARY_PATH'} = '/tools/ns/workshop-5.0/lib:' . $ENV{'LD_LIBRARY_PATH'};
-	    }
-	}
-    }
-    if ( $OS eq 'UnixWare' ) {
-	$ENV{'LPATH'} = '/usr/ucblib:/usr/X/lib:/usr/ccs/lib:' . $ENV{'LD_LIBRARY_PATH'};
-    }
-}
-
-##########################################################################
-# NO USER CONFIGURABLE PIECES BEYOND THIS POINT                          #
-##########################################################################
-
-sub GetSystemInfo {
-    $OS = `uname -s`;
-    $OSVer = `uname -r`;
-    $CPU = `uname -m`;
-
-    my($host) = "";
-    my($myhost) = hostname;
-
-    chop($OS, $OSVer, $CPU);
-    chomp($myhost);
-
-    ($host, $junk) = split(/\./, $myhost);
-
-    if ( $OS eq 'AIX' ) {
-	my($osAltVer) = `uname -v`;
-	chop($osAltVer);
-	$OSVer = $osAltVer . "." . $OSVer;
-    }
-
-    if ( $OS eq 'IRIX64' || $OS eq 'IRIX' ) {
-	$OS = 'IRIX';
-	$OSVerMajor = substr($OSVer, 0, 1);
-    }
-
-    if ( $OS eq 'QNX' ) {
-	$OSVer = `uname -v`;
-	chop($OSVer);
-	$OSVer =~ s/^([0-9])([0-9]*)$/$1.$2/;
-    }
-
-    if ( $OS eq 'SCO_SV' ) {
-	$OS = 'OpenServer';
-	$OSVer = '5.0';
-    }
-
-    if ( $OS eq 'SINIX-N' || $OS eq 'SINIX-Z' ) {
-	$OS = 'SINIX';
-    }
-
-    if ( $OS eq 'UNIX_SV' || $OS eq 'UnixWare' ) {
-	$OS = 'UnixWare';
-	$OSVer = `uname -v`;
-	chop($OSVer);
-    }
-
-    if ( "$host" ne "" ) {
-	$BuildName = $host . ' ' . $OS . ' ' . $OSVer;
-    }
-
-    # This is deliberate.  We want BuildName to use BSD/OS, but everything else should use BSD_OS.
-    if ( $OS eq 'BSD/OS' ) {
-	$OS = 'BSD_OS';
-    }
-
-    if ( $OS eq 'FreeBSD' || $OS eq 'OpenBSD' ) {
-	$BuildName = $host . ' ' . $OS . '/' . $CPU . ' ' . $OSVer;
-    }
-
-    if ( $OS eq 'Linux' ) {
-	if ( $CPU eq 'alpha' || $CPU eq 'sparc' ) {
-	    $BuildName = $host . ' ' . $OS . '/' . $CPU . ' ' . $OSVer;
-	    if ( $CPU eq 'alpha' ) {
-	        $ConfigureArgs .= '--disable-tests';
-		}
-	} elsif ( $CPU eq 'arm32' || $CPU eq 'armv4l' || $CPU eq 'sa110' ) {
-	    $BuildName = $host . ' ' . $OS . '/arm ' . $OSVer;
-	    # This is here because I ran out of space on my netwinder. --briano.
-	    $ConfigureArgs .= '--disable-debug --enable-optimize';
-	} elsif ( $CPU eq 'ppc' ) {
-	    $BuildName = $host . ' ' . $OS . '/' . $CPU . ' ' . $OSVer;
-	} else {
-	    $BuildName = $host . ' ' . $OS . '/i386 ' . $OSVer;
-	}
-    }
-
-    if ( $OS eq 'NetBSD' ) {
-	if ( $CPU eq 'arm32' || $CPU eq 'armv4l' || $CPU eq 'sa110' ) {
-	    $BuildName = $host . ' ' . $OS . '/arm ' . $OSVer;
-	} else {
-	    $BuildName = $host . ' ' . $OS . '/' . $CPU . ' ' . $OSVer;
-	}
-    }
-
-    if ( $OS eq 'SINIX' ) {
-	if ( $CPU eq '386/AT' ) {
-	    $BuildName = $host . ' ' . $OS . '/i386 ' . $OSVer;
-	} else {
-	    $BuildName = $host . ' ' . $OS . '/mips ' . $OSVer;
-	}
-    }
-
-    if ( $OS eq 'SunOS' ) {
-	if ( $CPU eq 'i86pc' ) {
-	    $BuildName = $host . ' ' . $OS . '/i386 ' . $OSVer;
-	} else {
-	    $OSVerMajor = substr($OSVer, 0, 1);
-	    if ( $OSVerMajor eq '5' ) {
-		$BuildName = $host . ' ' . $OS . '/sparc ' . $OSVer;
-	    }
-	}
-    }
-
-    $BuildName .= ' ' . ($BuildDepend?'Depend':'Clobber');
-    $DirName = $OS . '_' . $OSVer . '_' . ($BuildDepend?'depend':'clobber');
-    $logfile = "${DirName}.log";
-}
-
-sub BuildIt {
-    my($fe, @felist, $ClobberTarget, $DependTarget, $EarlyExit, $LastTime, $SaveCVSCO, $StartTimeStr, $comptmp, $jflag, $onlyonce);
-    $comptmp = '';
-    $jflag = '';
-    $onlyonce = 0;
-
-    mkdir("$DirName", 0777);
-    chdir("$DirName") || die "Couldn't enter $DirName";
-
-    $StartDir = getcwd();
-    $LastTime = 0;
-    $EarlyExit = 0;
-    $SaveCVSCO = $CVSCO;
-
-    # With only one it makes no sense to use this.
-    $jflag = "-j $cpus" if ( $cpus > 1 );
-
-    print "Starting dir is: $StartDir\n";
-
-    while ( ! $EarlyExit ) {
-	chdir("$StartDir");
-	if ( time - $LastTime < (60 * $BuildSleep) ) {
-	    $SleepTime = (60 * $BuildSleep) - (time - $LastTime);
-	    print "\n\nSleeping $SleepTime seconds ...\n";
-	    sleep($SleepTime);
-	}
-
-	$LastTime = time;
-
-	if ( $UseTimeStamp ) {
-	    $CVSCO = $SaveCVSCO;
-	} else {
-	    $CVSCO = $SaveCVSCO . ' -A';
-	}
-	$StartTime = time - 60 * 10;
-	$StartTimeStr = &CVSTime($StartTime);
-
-	&StartBuild if ( $ReportStatus );
- 	$CurrentDir = getcwd();
-	if ( $CurrentDir ne $StartDir ) {
-	    print "startdir: $StartDir, curdir $CurrentDir\n";
-	    die "curdir != startdir";
-	}
-
-	$BuildDir = $CurrentDir;
-
-	unlink( "$logfile" );
-
-	print "opening $logfile\n";
-	open( LOG, ">$logfile" ) || print "can't open $?\n";
-	print LOG "current dir is -- " . $ENV{'HOST'} . ":$CurrentDir\n";
-	print LOG "Build Administrator is $BuildAdministrator\n";
-	&PrintEnv;
-	if ( $Compiler ne '' ) {
-	    print LOG "===============================\n";
-	    if ( $Compiler eq 'gcc' || $Compiler eq 'egcc' ) {
-		$comptmp = `$Compiler --version`;
-		chop($comptmp);
-		print LOG "Compiler is -- $Compiler \($comptmp\)\n";
-	    } else {
-		print LOG "Compiler is -- $Compiler\n";
-	    }
-	    print LOG "===============================\n";
-	}
-
-	$BuildStatus = 0;
-
-	mkdir($TopLevel, 0777);
-	chdir($TopLevel) || die "chdir($TopLevel): $!\n";
-
-	print "$CVS $CVSCO mozilla/client.mk\n";
-	print LOG "$CVS $CVSCO mozilla/client.mk\n";
-	open (PULL, "$CVS $CVSCO mozilla/client.mk 2>&1 |") || die "open: $!\n";
-	while (<PULL>) {
-	    print $_;
-	    print LOG $_;
-	}
-	close(PULL);
-
-	# Do a separate checkout with toplevel makefile
-	print LOG "$Make -f mozilla/client.mk checkout CVSCO=\"$CVS $CVSCO\"|\n";
-	open (PULLALL, "$Make -f mozilla/client.mk checkout CVSCO=\"$CVS $CVSCO\" |\n");
-	while (<PULLALL>) {
-	    print LOG $_;
-	    print $_;
-	}
-	close(PULLALL);
-
-	if ( $BuildNSCommercial ) {
-	    print LOG "$CVS -d /m/src $CVSCO $NSCommModule\n";
-	    open (PULLNS, "$CVS -d /m/src $CVSCO $NSCommModule 2>&1 |") || die "open: $!\n";
-	    while (<PULLNS>) {
-		print LOG $_;
-		print $_;
-	    }
-	    close(PULLNS);
-	}
-
-	chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
-	print LOG "Build nspr\n";
-	open (BUILDNSPR, "gmake -C nsprpub $NSPRArgs export 2>&1 | ") || die "Build nspr: $!\n";
-	while (<BUILDNSPR>) {
-		print LOG $_;
-		print $_;
-	}
-
-	if ( $UseObjDir ) {
-	    print LOG "$ConfigGuess\n";
-	    $BuildObjName = "obj-";
-	    open (GETOBJ, "$ConfigGuess 2>&1 |") || die "$ConfigGuess: $!\n";
-	    while (<GETOBJ>) {
-		print $_;
-		print LOG $_;
-		chomp($BuildObjName .= $_); 
-	    }
-	    close (GETOBJ); 
-
-	    mkdir($BuildObjName, 0777);
-	    chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
-	}
-
-	&FinalizeLDLibPath('mozilla');
-
-	print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
-	open (CONFIGURE, "$ConfigureEnvArgs $ShellOverride ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
-	while (<CONFIGURE>) {
-	    print $_;
-	    print LOG $_;
-	}
-	close(CONFIGURE);
-
-	# If we are building depend, rebuild dependencies
-	if ( $BuildDepend ) {
-	    $ClobberTarget = '';
-	    $DependTarget = 'depend';
-	} else {
-	    $ClobberTarget = 'realclean';
-	    $DependTarget = '';
-	}
-
-	print LOG "$Make MAKE='$Make $jflag' $DependTarget $ClobberTarget 2>&1 |\n";
-	open (MAKEPREBUILD, "$Make MAKE='$Make $jflag' $DependTarget $ClobberTarget 2>&1 |");
-	while (<MAKEPREBUILD>) {
-	    print $_;
-	    print LOG $_;
-	}
-	close (MAKEPREBUILD);
-	system("rm -rf dist");
-
-	print LOG "$Make MAKE='$Make $jflag' $MakeOverrides 2>&1 |\n";
-	open(BUILD, "$Make MAKE='$Make $jflag' $MakeOverrides 2>&1 |\n");
-	while (<BUILD>) {
-	    print $_;
-	    print LOG $_;
-	}
-	close(BUILD);
-
-	if ( $BuildNSCommercial ) {
-	    chdir('../../ns') || die "chdir('../../ns'): $!\n";
-	    if ( $UseObjDir ) {
-		mkdir($BuildObjName, 0777);
-		chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
-	    }
-
-	    &FinalizeLDLibPath('ns');
-
-	    if ( ($BuildNSCommercial) && ($onlyonce == 0) ) {
-		$ConfigureArgs .= ' --with-moz-objs=' . $BaseDir . '/' . $DirName . '/mozilla/' . $BuildObjName;
-		$onlyonce = 1;
-	    }
-	    print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
-	    open (CONFIGURE, "$ConfigureEnvArgs $ShellOverride ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
-	    while (<CONFIGURE>) {
-		print $_;
-		print LOG $_;
-	    }
-	    close(CONFIGURE);
-
-	    print LOG "$Make MAKE='$Make $jflag' $DependTarget $ClobberTarget 2>&1 |\n";
-	    open (MAKEPREBUILD, "$Make MAKE='$Make $jflag' $DependTarget $ClobberTarget 2>&1 |");
-	    while (<MAKEPREBUILD>) {
-		print $_;
-		print LOG $_;
-	    }
-	    close (MAKEPREBUILD);
-	    system("rm -rf dist");
-
-	    print LOG "$Make MAKE='$Make $jflag' $MakeOverrides 2>&1 |\n";
-	    open(BUILD, "$Make MAKE='$Make $jflag' $MakeOverrides 2>&1 |\n");
-	    while (<BUILD>) {
-		print $_;
-		print LOG $_;
-	    }
-	    close(BUILD);
-	}
-
-	@felist = split(/,/, $FE);
-
-	foreach $fe (@felist) {
-	    if ( &BinaryExists($fe) ) {
-		if ( $RunTest ) {
-		    print LOG "$FE binary exists, build successful.  Testing...\n";
-		    $BuildStatus = &RunSmokeTest($fe);
-		} else {
-		    print LOG "$FE binary exists, build successful.  Skipping test.\n";
-		    $BuildStatus = 0;
-		}
-	    } else {
-		print LOG "$FE binary missing, build FAILED\n";
-		$BuildStatus = 666;
-	    }
-
-	    if ( $BuildStatus == 0 ) {
-		$BuildStatusStr = 'success';
-	    }
-	    elsif ( $BuildStatus == 333 ) {
-		$BuildStatusStr = 'testfailed';
-	    } else {
-		$BuildStatusStr = 'busted';
-	    }
-	    print LOG "tinderbox: tree: $BuildTree\n";
-	    print LOG "tinderbox: builddate: $StartTime\n";
-	    print LOG "tinderbox: status: $BuildStatusStr\n";
-	    if ( $UseMotif ) {
-		print LOG "tinderbox: build: $BuildName Motif $fe\n";
-	    } else {
-		print LOG "tinderbox: build: $BuildName $fe\n";
-	    }
-	    print LOG "tinderbox: errorparser: unix\n";
-	    print LOG "tinderbox: buildfamily: unix\n";
-	    print LOG "tinderbox: END\n";	    
-	}
-	close(LOG);
-	chdir("$StartDir");
-
-	# This fun line added on 2/5/98.  Do not remove.  Translated to english,
-	# that's "take any line longer than 1000 characters, and split it into less
-	# than 1000 char lines.  If any of the resulting lines is
-	# a dot on a line by itself, replace that with a blank line."  
-	# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
-	# interprets that as the end of the mail, and truncates the log before
-	# it gets to Tinderbox.  (Terry Weismann, Chris Yeh)
-	#
-	# This was replaced by a perl 'port' of the above, writen by 
-	# preed@netscape.com; good things: no need for system() call, and now it's
-	# all in perl, so we don't have to do OS checking like before.
-
-	open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
-	open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
-
-	while (<LOG>) {
-	    $q = 0;
-	    for (;;) {
-		$val = $q * 1000;
-		$Output = substr($_, $val, 1000);
-
-		last if ( $Output eq undef );
-
-		$Output =~ s/^\.$//g;
-		$Output =~ s/\n//g;
-		print OUTLOG "$Output\n";
-		$q++;
-	    }
-	}
-
-	close(LOG);
-	close(OUTLOG);
-
-	system( "$mail $Tinderbox_server < ${logfile}.last" ) if ( $ReportStatus );
-	unlink("$logfile");
-
-	# If this is a test run, set early_exit to 0. 
-	# This mean one loop of execution
-	$EarlyExit++ if ( $BuildOnce );
-    }
-}
-
-sub CVSTime {
-    my($StartTimeArg) = @_;
-    my($RetTime, $sec, $minute, $hour, $mday, $mon, $year);
-
-    ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
-    $mon++; # month is 0 based.
-
-    if ( $UseTimeStamp ) {
-	$BuildStart = `date '+%m/%d/%Y %H:%M'`;
-	chop($BuildStart);
-	$CVSCO .= " -D '$BuildStart'";
-    }
-
-    sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
-}
-
-sub StartBuild {
-    my($fe, @felist);
-
-    @felist = split(/,/, $FE);
-
-    open( LOG, "|$mail $Tinderbox_server" );
-    foreach $fe ( @felist ) {
-	print LOG "\n";
-	print LOG "tinderbox: tree: $BuildTree\n";
-	print LOG "tinderbox: builddate: $StartTime\n";
-	print LOG "tinderbox: status: building\n";
-	if ( $UseMotif ) {
-	    print LOG "tinderbox: build: $BuildName Motif $fe\n";
-	} else {
-	    print LOG "tinderbox: build: $BuildName $fe\n";
-	}
-	print LOG "tinderbox: errorparser: unix\n";
-	print LOG "tinderbox: buildfamily: unix\n";
-	print LOG "tinderbox: END\n";
-	print LOG "\n";
-    }
-    close( LOG );
-}
-
-# check for the existence of the binary
-sub BinaryExists {
-    my($Binname);
-
-    if ( $BuildNSCommercial ) {
-	$BinName = $BuildDir . '/' . $Toplevel . '/ns/' . $BuildObjName . $BinaryName;
-    } else {
-	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName;
-    }
-
-    print LOG $BinName . "\n"; 
-    if ( (-e $BinName) && (-x $BinName) && (-s $BinName) ) {
-	1;
-    }
-    else {
-	0;
-    }
-}
-
-sub ParseArgs {
-    my($i, $manArg);
-
-    if( @ARGV == 0 ) {
-	&PrintUsage;
-    }
-    $i = 0;
-    $manArg = 0;
-    while( $i < @ARGV ) {
-	if ( $ARGV[$i] eq '--clobber' ) {
-	    $BuildDepend = 0;
-	    $ConfigureArgs .= '--disable-md ';
-	    $manArg++;
-	}
-	elsif ( $ARGV[$i] eq '--commercial' ) {
-	    $BuildNSCommercial = 1;
-	    $Tinderbox_server = 'tinderbox-daemon\@warp';
-	}
-	elsif ( $ARGV[$i] eq '--compress' ) {
-	    $CVS = 'cvs -q -z3';
-	}
-	elsif ( $ARGV[$i] eq '--depend' ) {
-	    $BuildDepend = 1;
- 	    $manArg++;
-	}
-	elsif ( $ARGV[$i] eq '--help' || $ARGV[$i] eq '-h' ) {
-	    &PrintUsage;
-	}
-	elsif ( $ARGV[$i] eq '--motif' ) {
-	    $UseMotif = 1;
-	    $ConfigureArgs .= '--enable-toolkit=motif ';
-	}
-	elsif ( $ARGV[$i] eq '--noobjdir' ) {
-	    $UseObjDir = 0;
-	}
-	elsif ( $ARGV[$i] eq '--noreport' ) {
-	    $ReportStatus = 0;
-	}
-	elsif ( $ARGV[$i] eq '--notest' ) {
-	    $RunTest = 0;
-	}
-	elsif ( $ARGV[$i] eq '--once' ) {
-	    $BuildOnce = 1;
-	}
-	elsif ( $ARGV[$i] eq '-tag' ) {
-	    $i++;
-	    $BuildTag = $ARGV[$i];
-	    if ( $BuildTag eq '' || $BuildTag eq '-t' ) {
-		&PrintUsage;
-	    } else {
-		$CVSCO .= " -r $BuildTag";
-	    }
-	}
-	elsif ( $ARGV[$i] eq '--talkback' ) {
-	    $UseFullCircle = 1;
-	    $ConfigureArgs .= '--enable-fullcircle --with-fullcircle=' . $FullCircleDir . ' ';
-	}
-	elsif ( $ARGV[$i] eq '--timestamp' ) {
-	    $UseTimeStamp = 1;
-	}
-	elsif ( $ARGV[$i] eq '-t' ) {
-	    $i++;
-	    $BuildTree = $ARGV[$i];
-	    if ( $BuildTree eq '' ) {
-		&PrintUsage;
-	    }
-	}
-	elsif ( $ARGV[$i] eq '--version' || $ARGV[$i] eq '-v' ) {
-	    die "$0: version" . substr($Version,9,6) . "\n";
-	} else {
-	    &PrintUsage;
-	}
-	$i++;
-    }
-
-    if ( $BuildTree =~ /^\s+$/i ) {
-	&PrintUsage;
-    }
-
-    if ( $BuildDepend eq undef ) {
-	&PrintUsage;
-    }
-
-    &PrintUsage if ( $manArg == 0 );
-}
-
-sub PrintUsage {
-    die "usage: $0 --depend | --clobber [ --once --compress --noreport --notest --timestamp -tag TREETAG -t TREENAME --version ]\n";
-}
-
-sub PrintEnv {
-    my($key);
-    foreach $key (sort(keys %ENV)) {
-	print LOG $key, '=', $ENV{$key}, "\n";
-	print $key, '=', $ENV{$key}, "\n";
-    }
-}
-
-sub RunSmokeTest {
-    my($Binary, $BinaryLog);
-    my($status) = 0;
-    my($waittime) = 60;
-    my($pid) = fork;
-
-    if ( $BuildNSCommercial ) {
-	$ENV{"MOZILLA_FIVE_HOME"} = $BuildDir . '/' . $TopLevel . '/ns/' . $BuildObjName . '/dist/bin';
-	$Binary = $BuildDir . '/' . $TopLevel . '/ns/' . $BuildObjName . $BinaryName;
-    } else {
-	$ENV{"MOZILLA_FIVE_HOME"} = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . '/dist/bin';
-	$Binary = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName;
-    }
-
-    $BinaryLog = $BuildDir . '/runlog';
-
-    print LOG $Binary . "\n";
-
-    if ( !$pid ) { # child
-	chdir("$ENV{'MOZILLA_FIVE_HOME'}");
-	print LOG "MOZILLA_FIVE_HOME = $ENV{'MOZILLA_FIVE_HOME'}\n";
-	print LOG `pwd`;
-	unlink("$BinaryLog");
-	open(STDOUT,">$BinaryLog");
-	select STDOUT; $| = 1; # make STDOUT unbuffered
-	open(STDERR,">&STDOUT");
-	select STDERR; $| = 1; # make STDERR unbuffered
-	exec("$Binary");
-	close(STDOUT);
-	close(STDERR);
-	die "Couldn't exec()";
-    }
-
-    # parent - wait $waittime seconds then check on child
-    sleep $waittime;
-    $status = waitpid($pid, WNOHANG());
-    if ( $status != 0 ) {
-	print LOG "$Binary has crashed or quit.  Turn the tree orange now.\n";
-	print LOG "------------------------- Output from $FE\n";
-	open(READRUNLOG, "$BinaryLog");
-	while (<READRUNLOG>) {
-	    print $_;
-	    print LOG $_;
-	}
-	close(READRUNLOG);
-	print LOG "------------------------- End of Output\n";
-	return 333;
-    }
-
-    print LOG "Success!  $FE is still running.  Killing...\n";
-    for ($i=0 ; $i<3 ; $i++) {
-	kill('TERM',$pid,);
-	# give it 3 seconds to actually die
-	sleep 3;
-	$status = waitpid($pid, WNOHANG());
-	last if ( $status != 0 );
-    }
-    return 0;
-}
-
-# Main function
-&InitVars;
-&ParseArgs;
-&GetSystemInfo;
-&SetupEnv;
-&BuildIt;
-
-1;