Cope with new Bonsai code. In particular, renamed globals.pl to be tbglobals.pl, to avoid conflicting with Bonsai's new globals.pl.

webtools/tinderbox/Makefile

@@ -40,13 +40,13 @@ ep_mac.pl	\
 ep_unix.pl	\
 ep_windows.pl	\
 fixupimages.pl	\
-globals.pl	\
 handlemail.pl	\
 imagelog.pl	\
 processbuild.pl	\
 showbuilds.cgi	\
 showimages.cgi	\
 showlog.cgi	\
+tbglobals.pl	\
 Empty.html	\
 faq.html	\
 index.html	\

webtools/tinderbox/README

@@ -277,7 +277,7 @@ ep_windows.pl	Knows how to parse Windows build error logs.  Used by ???
 faq.html	Wildly out of date.
 
 fixupimages.pl	???
-globals.pl	???
+tbglobals.pl	???
 imagelog.pl	???
 index.html	???
 reledanim.gif	???

webtools/tinderbox/addimage.cgi

@@ -28,7 +28,7 @@ EmitHtmlTitleAndHeader("tinderbox: add images", "add images");
 
 $| = 1;
 
-require "globals.pl";
+require "tbglobals.pl";
 require "imagelog.pl";
 
 &split_cgi_args;

webtools/tinderbox/addnote.cgi

@@ -20,7 +20,7 @@
 use lib "../bonsai";
 use Fcntl;
 
-require "globals.pl";
+require "tbglobals.pl";
 require 'lloydcgi.pl';
 
 if (defined($args = $form{log})) {

webtools/tinderbox/admintree.cgi

@@ -20,7 +20,7 @@
 use lib "../bonsai";
 
 require 'lloydcgi.pl';
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'header.pl';
 
 $|=1;

webtools/tinderbox/buildwho.pl

@@ -19,7 +19,7 @@
 
 use lib "../bonsai";
 
-require 'globals.pl';
+require 'tbglobals.pl';
 
 $F_DEBUG=1;
 

webtools/tinderbox/bustagestats.cgi

@@ -20,7 +20,7 @@
 use lib "../bonsai";
 
 require 'lloydcgi.pl';
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'header.pl';
 
 use Date::Parse;

webtools/tinderbox/doadmin.cgi

@@ -20,7 +20,7 @@
 
 use lib "../bonsai";
 require 'lloydcgi.pl';
-require 'globals.pl';
+require 'tbglobals.pl';
 
 umask O666;
 

webtools/tinderbox/fixupimages.pl

@@ -19,7 +19,7 @@
 
 use Socket;
 
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'imagelog.pl';
 
 # Port an old-style imagelog thing to a newstyle one

webtools/tinderbox/processbuild.pl

@@ -17,7 +17,7 @@
 # Corporation. Portions created by Netscape are Copyright (C) 1998
 # Netscape Communications Corporation. All Rights Reserved.
 
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'timelocal.pl';
 
 umask 0;

webtools/tinderbox/showbuilds.cgi

@@ -18,7 +18,7 @@
 # Netscape Communications Corporation. All Rights Reserved.
 
 use lib '../bonsai';
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'lloydcgi.pl';
 require 'imagelog.pl';
 require 'header.pl';
@@ -164,9 +164,10 @@ sub print_page_head {
   # Get the warnings summary
   do "$tree/warn.pl" if $nowdate eq $maxdate;
 
-  use POSIX qw(strftime);
+#  use POSIX qw(strftime);
   # Print time in format, "HH:MM timezone"
-  my $now = strftime("%H:%M %Z", localtime);
+#  my $now = strftime("%H:%M %Z", localtime);
+  $now = "Now";
 
   EmitHtmlTitleAndHeader("tinderbox: $tree", "tinderbox",
                          "tree: $tree ($now)");
@@ -453,19 +454,22 @@ sub has_who_list {
 }
 
 sub tree_open {
-  my $done, $line, $a, $b;
-  open(BID, "<../bonsai/data/$bonsai_tree/batchid")
+  my $line, $treestate;
+  open(BID, "<../bonsai/data/$bonsai_tree/batchid.pl")
     or print "can't open batchid<br>";
-  ($a,$b,$bid) = split / /, <BID>;
+  $line = <BID>;
   close(BID);
-  open(BATCH, "<../bonsai/data/$bonsai_tree/batch-${bid}")
-    or print "can't open batch-${bid}<br>";;
-  $done = 0;
-  while (($line = <BATCH>) and not $done){ 
-    if ($line =~ /^set treeopen/) {
-      chop $line;
-      ($a,$b,$treestate) = split / /, $line ;
-      $done = 1;
+  if ($line =~ m/'(\d+)'/) {
+      $bid = $1;
+  } else {
+      return 0;
+  }
+  open(BATCH, "<../bonsai/data/$bonsai_tree/batch-${bid}.pl")
+    or print "can't open batch-${bid}.pl<br>";
+  while ($line = <BATCH>){ 
+    if ($line =~ /^$::TreeOpen = '(\d+)';/) {
+        $treestate = $1;
+        break;
     }
   }
   close(BATCH);
@@ -688,7 +692,7 @@ sub do_flash {
     $text .= ($busted > 1 ? ' are ' : ' is ') . 'busted';
     
     # The Flash spec says we need to give ctime.
-    use POSIX;
+#    use POSIX;
     my $tm = POSIX::ctime(time());
     $tm =~ s/^...\s//;   # Strip day of week
     $tm =~ s/:\d\d\s/ /; # Strip seconds

webtools/tinderbox/showimages.cgi

@@ -22,7 +22,7 @@ $| = 1;
 
 use lib "../bonsai";
 
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'imagelog.pl';
 require 'lloydcgi.pl';
 require 'header.pl';

webtools/tinderbox/showlog.cgi

@@ -19,7 +19,7 @@
 
 use lib '../bonsai';
 
-require 'globals.pl';
+require 'tbglobals.pl';
 require 'lloydcgi.pl';
 require 'header.pl';
 

webtools/tinderbox/viewallnotes.cgi

@@ -18,7 +18,7 @@
 # Netscape Communications Corporation. All Rights Reserved.
 
 use lib '../bonsai';
-require "globals.pl";
+require "tbglobals.pl";
 require 'lloydcgi.pl';
 require 'header.pl';
 

webtools/tinderbox/warnings.pl

@@ -22,9 +22,9 @@
 use FileHandle;
 
 $tree = 'SeaMonkey';
-# tinderbox/globals.pl uses many shameful globals
+# tinderbox/tbglobals.pl uses many shameful globals
 $form{tree} = $tree;
-require 'globals.pl';
+require 'tbglobals.pl';
 
 $cvsroot = '/cvsroot/mozilla';
 $lxr_data_root = '/export2/lxr-data';