b=388654

r=cf
- Search through the list of possible build ID locations for XR apps until we find the build ID.

tools/tinderbox/post-mozilla-rel.pl

@@ -520,10 +520,26 @@ sub get_buildid {
   if (-e $platformIni) {
       my $c = read_file($platformIni);
       if ($c =~ /^BuildID=(\d+)/m) {
-	  $buildid = $1;
+          $buildid = $1;
       }
   }
 
+  if (!defined($buildid) && $Settings::XULRunnerApp) {
+    my @possibleBuildIdLocations = (
+        "$objdir/xulrunner/dist/bin/platform.ini",
+        "$objdir/xulrunner/toolkit/xre/platform.ini",        
+    );
+    foreach my $file (@possibleBuildIdLocations) {
+      if (-e $file) {
+        my $c = read_file($file);
+        if ($c =~ /^BuildID=(\d+)/m) {
+	  $buildid = $1;
+          last;
+        }
+      }
+    }
+  }
+
   if (!defined($buildid) && defined($dist)) {
       # First try to get the build ID from the files in dist/.
       my $find_master = `find $dist -iname master.ini -print`;

tools/tinderbox/tinder-config.pl

@@ -141,9 +141,16 @@
 # Allow for non-client builds, e.g. camino.
 #$moz_client_mk = 'client.mk';
 
+# Set if you're building an app on top of XULRunner.
+#$XULRunnerApp = 0;
+
 #- Set if you want to build in a separate object tree
 #$ObjDir = '';
 
+# If the build is a combined xulrunner+something, set the "something"
+# subdirectory: example "firefox/" - NOTE: need trailing slash!
+#$SubObjDir = '';
+
 # Extra build name, if needed.
 #$BuildNameExtra = '';
 

tools/tinderbox/tinder-defaults.pl

@@ -168,6 +168,9 @@ $Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
 # Allow for non-client builds, e.g. camino.
 $moz_client_mk = 'client.mk';
 
+# Set if you're building an app on top of XULRunner.
+$XULRunnerApp = 0;
+
 #- Set if you want to build in a separate object tree
 $ObjDir = '';