1 # HG changeset patch

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     3 # Parent 7351fc8754c200b787fd701e7efa5fd2fc5864ff

     4 Bug 588129 - symbols.txt file missing from *.crashreporter-symbols.zip

     5 

     6 diff --git a/Makefile.in b/Makefile.in

     7 --- a/Makefile.in

     8 +++ b/Makefile.in

     9 @@ -183,17 +183,20 @@ ifdef MOZ_CRASHREPORTER

    10  	  $(DIST)/crashreporter-symbols                                   \

    11  	  $(MAKE_SYM_STORE_PATH) >                                        \

    12  	  $(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME)

    13  	echo packing symbols

    14  	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)

    15  	cd $(DIST)/crashreporter-symbols && \

    16            zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" .

    17  	cd $(DIST)/crashreporter-symbols && \

    18 -          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym"

    19 +	grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \

    20 +	  mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)

    21 +	cd $(DIST)/crashreporter-symbols && \

    22 +          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt"

    23  else

    24  ifdef WINCE

    25  ifdef SYMBOLSTORE_PATH

    26  	echo building symbol store with symstore.exe

    27  	$(RM) -rf $(DIST)/symbols

    28  	$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"

    29  	$(NSINSTALL) -D $(DIST)/symbols

    30  	$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \