Bug 588129 - symbols.txt file missing from *.crashreporter-symbols.zip. r=ted, a20=bsmedberg
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 06 Dec 2010 16:16:30 +0100
changeset 58656 432e9dc771d2c472f0c3c2b3f2166fb71aec9ad4
parent 58655 5c5042709dd45f1113267479454b2fa203e507f1
child 58657 8bc10b6a22223c8e9ad1c0070329cebdffe7ad69
push idunknown
push userunknown
push dateunknown
reviewersted
bugs588129
milestone2.0b8pre
Bug 588129 - symbols.txt file missing from *.crashreporter-symbols.zip. r=ted, a20=bsmedberg
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,17 +187,20 @@ ifdef MOZ_CRASHREPORTER
 	  $(DIST)/crashreporter-symbols                                   \
 	  $(MAKE_SYM_STORE_PATH) >                                        \
 	  $(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME)
 	echo packing symbols
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	cd $(DIST)/crashreporter-symbols && \
           zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" .
 	cd $(DIST)/crashreporter-symbols && \
-          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym"
+	grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \
+	  mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)
+	cd $(DIST)/crashreporter-symbols && \
+          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt"
 else
 ifdef WINCE
 ifdef SYMBOLSTORE_PATH
 	echo building symbol store with symstore.exe
 	$(RM) -rf $(DIST)/symbols
 	$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
 	$(NSINSTALL) -D $(DIST)/symbols
 	$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \