Skip to content

Commit

Permalink
Bug 1307435 - Generate symbols zip file concurrently; r=ted
Browse files Browse the repository at this point in the history
Each archive takes 10+ seconds to generate. Split the archiving
part into separate make targets so this completes faster.

I'm not super thrilled about adding yet more make targets to the
root Makefile.in. We can refactor this later. For now, let's
take the quick win.

MozReview-Commit-ID: 2Oeq1rX6yLw
  • Loading branch information
indygreg committed Oct 4, 2016
1 parent 6d026eb commit dbda214
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ SYMBOL_INDEX_NAME = \
$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
endif

buildsymbols:
ifdef MOZ_CRASHREPORTER
.PHONY: generatesymbols
generatesymbols:
echo building symbol store
$(RM) -r $(DIST)/crashreporter-symbols
$(RM) '$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip'
Expand All @@ -323,14 +323,25 @@ ifdef MOZ_CRASHREPORTER
$(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME)
echo packing symbols
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)

.PHONY: symbolsfullarchive
symbolsfullarchive: generatesymbols
cd $(DIST)/crashreporter-symbols && \
zip -r5D '../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' . -x '*test*' -x '*Test*'

.PHONY: symbolsarchive
symbolsarchive: generatesymbols
cd $(DIST)/crashreporter-symbols && \
grep 'sym' $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \
mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)
cd $(DIST)/crashreporter-symbols && \
zip -r5D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt'
endif # MOZ_CRASHREPORTER

ifdef MOZ_CRASHREPORTER
buildsymbols: symbolsfullarchive symbolsarchive
else
buildsymbols:
endif

uploadsymbols:
ifdef MOZ_CRASHREPORTER
Expand Down

0 comments on commit dbda214

Please sign in to comment.