Bug 1314713 - Stop generating *symbols.txt files as part of dumping/packaging build symbols. r=ted

MozReview-Commit-ID: HPKIqgZK0Kj

--HG--
extra : rebase_source : 621afc1b1f60f79aeaaa37db41cb602cdc527848
This commit is contained in:
Chris Manchester 2017-03-24 10:41:04 -07:00
parent 892d75ecb7
commit 8bf267a9f6

View file

@ -280,8 +280,6 @@ SYM_STORE_SOURCE_DIRS := $(topsrcdir)
ifdef MOZ_CRASHREPORTER ifdef MOZ_CRASHREPORTER
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
SYMBOL_INDEX_NAME = \
$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
endif endif
.PHONY: generatesymbols .PHONY: generatesymbols
@ -297,8 +295,7 @@ generatesymbols:
$(foreach dir,$(SYM_STORE_SOURCE_DIRS),-s $(dir)) \ $(foreach dir,$(SYM_STORE_SOURCE_DIRS),-s $(dir)) \
$(DUMP_SYMS_BIN) \ $(DUMP_SYMS_BIN) \
$(DIST)/crashreporter-symbols \ $(DIST)/crashreporter-symbols \
$(MAKE_SYM_STORE_PATH) | grep -iv test > \ $(MAKE_SYM_STORE_PATH)
$(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME)
echo packing symbols echo packing symbols
$(NSINSTALL) -D $(DIST)/$(PKG_PATH) $(NSINSTALL) -D $(DIST)/$(PKG_PATH)
@ -310,10 +307,7 @@ symbolsfullarchive: generatesymbols
.PHONY: symbolsarchive .PHONY: symbolsarchive
symbolsarchive: generatesymbols symbolsarchive: generatesymbols
cd $(DIST)/crashreporter-symbols && \ cd $(DIST)/crashreporter-symbols && \
grep 'sym' $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \ zip -r5D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym'
mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)
cd $(DIST)/crashreporter-symbols && \
zip -r5D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt'
ifdef MOZ_CRASHREPORTER ifdef MOZ_CRASHREPORTER
buildsymbols: symbolsfullarchive symbolsarchive buildsymbols: symbolsfullarchive symbolsarchive