From 548e8dfeaeb7372ba34539065ea61eddccb11b8e Mon Sep 17 00:00:00 2001
From:  <ted.mielczarek@gmail.com>
Date: Sat, 30 Jun 2007 05:57:43 -0700
Subject: [PATCH] bug 386212 - fx-win32-tbox has lost the ability to report
 finishing nightly builds.  r=bsmedberg

---
 Makefile.in                         |  4 ++--
 toolkit/airbag/tools/symbolstore.py | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ba6964968ba64..e7ec331b1c964 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,10 +146,10 @@ endif
 ifeq ($(OS_ARCH),Darwin)
 # need to pass arch flags for universal builds
 ifdef UNIVERSAL_BINARY
-MAKE_SYM_STORE_ARGS := -a "ppc i386"
+MAKE_SYM_STORE_ARGS := -a "ppc i386" --vcs-info
 MAKE_SYM_STORE_PATH := $(DIST)/universal
 else
-MAKE_SYM_STORE_ARGS := -a $(OS_TEST)
+MAKE_SYM_STORE_ARGS := -a $(OS_TEST) --vcs-info
 MAKE_SYM_STORE_PATH := $(DIST)/bin
 endif
 DUMP_SYMS_BIN := $(DIST)/host/bin/dump_syms
diff --git a/toolkit/airbag/tools/symbolstore.py b/toolkit/airbag/tools/symbolstore.py
index 7ccfb4b8e92ae..1cb7f07da643f 100755
--- a/toolkit/airbag/tools/symbolstore.py
+++ b/toolkit/airbag/tools/symbolstore.py
@@ -146,7 +146,7 @@ class Dumper:
     ProcessDir.  Instead, call GetPlatformSpecificDumper to
     get an instance of a subclass."""
     def __init__(self, dump_syms, symbol_path,
-                 archs=None, srcdir=None, copy_debug=False):
+                 archs=None, srcdir=None, copy_debug=False, vcsinfo=False):
         self.dump_syms = dump_syms
         self.symbol_path = symbol_path
         if archs is None:
@@ -159,6 +159,7 @@ def __init__(self, dump_syms, symbol_path,
         else:
             self.srcdir = None
         self.copy_debug = copy_debug
+        self.vcsinfo = vcsinfo
 
     # subclasses override this
     def ShouldProcess(self, file):
@@ -229,7 +230,8 @@ def ProcessFile(self, file):
                             # FILE index filename
                             (x, index, filename) = line.split(None, 2)
                             filename = self.FixFilenameCase(filename.rstrip())
-                            filename = GetVCSFilename(filename, self.srcdir)
+                            if self.vcsinfo:
+                                filename = GetVCSFilename(filename, self.srcdir)
                             f.write("FILE %s %s\n" % (index, filename))
                         else:
                             # pass through all other lines unchanged
@@ -313,6 +315,9 @@ def main():
     parser.add_option("-s", "--srcdir",
                       action="store", dest="srcdir",
                       help="Use SRCDIR to determine relative paths to source files")
+    parser.add_option("-v", "--vcs-info",
+                      action="store_true", dest="vcsinfo",
+                      help="Try to retrieve VCS info for each FILE listed in the output")
     (options, args) = parser.parse_args()
 
     if len(args) < 3:
@@ -323,7 +328,8 @@ def main():
                                        symbol_path=args[1],
                                        copy_debug=options.copy_debug,
                                        archs=options.archs,
-                                       srcdir=options.srcdir)
+                                       srcdir=options.srcdir,
+                                       vcsinfo=options.vcsinfo)
     for arg in args[2:]:
         dumper.Process(arg)