From 71e59e0ddaa74f0e6a10e4f0c08bf0a8b442f950 Mon Sep 17 00:00:00 2001
From: "preed%mozilla.com" <preed%mozilla.com>
Date: Wed, 5 Jul 2006 20:13:03 +0000
Subject: [PATCH] Bug 343665: Support MacOS-specific (.app) product names in
 tbox. r=rhelmer

---
 tools/tinderbox/build-seamonkey-util.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl
index 34821a1e6c0d..9f5a0c35a2d6 100644
--- a/tools/tinderbox/build-seamonkey-util.pl
+++ b/tools/tinderbox/build-seamonkey-util.pl
@@ -24,7 +24,7 @@ use Config;         # for $Config{sig_name} and $Config{sig_num}
 use File::Find ();
 use File::Copy;
 
-$::UtilsVersion = '$Revision: 1.325 $ ';
+$::UtilsVersion = '$Revision: 1.326 $ ';
 
 package TinderUtils;
 
@@ -484,11 +484,14 @@ sub SetupPath {
         # you have to match BuildDebug and --enable-optimize, 
         # --disable-debug to make things work here.
 
+        my $actualProductName = defined($Settings::MacOSProductName) ?
+         $Settings::MacOSProductName : $Settings::ProductName;
+        
         $Settings::DistBin = "dist/";
 
         # Deal with the most common case first.
         if ($Settings::ProductName ne 'XULRunner') {
-            $Settings::DistBin .= "$Settings::ProductName";
+            $Settings::DistBin .= $actualProductName;
             if ($Settings::BuildDebug) {
                 $Settings::DistBin .= "Debug";
             }
@@ -1782,7 +1785,7 @@ sub send_results_to_server {
         };
         if ($@) {
             warn "Failed to submit startup results: $@";
-            print_log "send_results_to_server() failed.\n";
+            print_log "send_results_to_server() failed: $@\n";
         } else {
             print_log "Results submitted to server: \n" .
               $res->status_line . "\n" . $res->content . "\n";