From 852139d801b4ad8875c10d62e2be523bce841a87 Mon Sep 17 00:00:00 2001 From: Chris AtLee Date: Fri, 23 Apr 2010 13:00:06 -0700 Subject: [PATCH] bug 561419: Only upload breakpad symbols to FTP for now, to reduce load on mv<-->mpt link. r=bsmedberg, a=dholbert_sheriff --- Makefile.in | 6 ++++-- toolkit/mozapps/installer/package-name.mk | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index dc20351f7d8f2..30b5541db4441 100644 --- a/Makefile.in +++ b/Makefile.in @@ -195,7 +195,9 @@ ifdef MOZ_CRASHREPORTER echo packing symbols $(NSINSTALL) -D $(DIST)/$(PKG_PATH) cd $(DIST)/crashreporter-symbols && \ - zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . + zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" . + cd $(DIST)/crashreporter-symbols && \ + zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" else ifdef WINCE ifdef SYMBOLSTORE_PATH @@ -215,7 +217,7 @@ endif # MOZ_CRASHREPORTER uploadsymbols: ifdef MOZ_CRASHREPORTER - $(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh "$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" + $(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh "$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" endif # defined in package-name.mk diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index f85018d63c48d..6eddea3a3e1bf 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -165,6 +165,7 @@ PKG_SRCPACK_PATH = source/ endif # MOZ_PKG_PRETTYNAMES # Symbol package naming +SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols-full SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols # Test package naming