From c4770b8d48be18fc28ed5b3f8878016fdabf9028 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Mon, 25 Jun 2007 07:58:46 +0000 Subject: [PATCH] Bug 383167 - Put buildid in an external file, tinderbox client changes r=rhelmer --- tools/tinderbox/post-mozilla-rel.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/tinderbox/post-mozilla-rel.pl b/tools/tinderbox/post-mozilla-rel.pl index 169c38edcbb..07e7e463fbf 100755 --- a/tools/tinderbox/post-mozilla-rel.pl +++ b/tools/tinderbox/post-mozilla-rel.pl @@ -447,7 +447,21 @@ sub get_buildid { my $objdir = $args{'objdir'}; my $buildid; + my $platformIni; if (defined($dist)) { + $platformIni = "$dist/bin/platform.ini"; + } + else { + $platformIni = "$objdir/toolkit/xre/platform.ini"; + } + if (-e $platformIni) { + my $c = read_file($platformIni); + if ($c =~ /^BuildID=(\d+)/m) { + $buildid = $1; + } + } + + 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`; my @find_output = split(/\n/, $find_master); @@ -1252,6 +1266,7 @@ sub main { my $url_path = $Settings::url_path; my $buildid = get_buildid(objdir=>$objdir); + TinderUtils::print_log("buildid: $buildid\n"); my $datestamp; if ($buildid ne '0000000000' &&