Bug 1293943 - l10n nightlies busted on wget-en-US r=Fallen a=ewong
☠☠ backed out by c3daef7d184b ☠ ☠
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 19 Sep 2016 09:45:41 +0800
changeset 20105 daeb41bc07bbe0059d419bd0ed71a614d1ae0cc5
parent 20104 2a22881408f8cd224401ad1383624579bf30421c
child 20106 c3daef7d184b8e55f269e168c50ca1cde3035348
push id12320
push userewong@pw-wspx.org
push dateMon, 19 Sep 2016 01:47:28 +0000
treeherdercomm-central@daeb41bc07bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, ewong
bugs1293943
Bug 1293943 - l10n nightlies busted on wget-en-US r=Fallen a=ewong
calendar/lightning/lightning-packager.mk
suite/locales/Makefile.in
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -72,17 +72,22 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 SHORTOS = osx
 else
 SHORTOS = linux
 endif
 
 # function print_ltnconfig(section,configname)
 print_ltnconfig = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(XPI_STAGE_PATH)/$(XPI_NAME)/app.ini $1 $2)
 
-wget-en-US: FINAL_BINARY_URL = $(subst thunderbird,calendar/lightning,$(EN_US_BINARY_URL))
+wget-en-US:
+ifeq ($MOZ_APP_NAME),thunderbird)
+FINAL_BINARY_URL = $(subst thunderbird,calendar/lightning,$(EN_US_BINARY_URL))
+else
+FINAL_BINARY_URL = $(subst seamonkey,calendar/lightning,$(subst latest-comm-central-trunk,latest-comm-central,EN_US_BINARY_URL)))
+endif
 wget-en-US: $(XPI_STAGE_PATH)
 	(cd $(XPI_STAGE_PATH) && $(WGET) -nv -N $(FINAL_BINARY_URL)/$(ENUS_PKGNAME).xpi)
 	@echo "Downloaded $(FINAL_BINARY_URL)/$(ENUS_PKGNAME) to $(XPI_ZIP_IN)"
 
 
 # We're unpacking directly into FINAL_TARGET, this keeps code to do manual
 # repacks cleaner.
 unpack: $(XPI_ZIP_IN)
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -219,45 +219,57 @@ ifdef MOZ_CALENDAR
 LIGHTNING_PATH=$(DEPTH)/calendar/lightning
 GDATA_PATH=$(DEPTH)/calendar/providers/gdata
 
 define run-calendar-rule
 $(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
 $(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
 endef
 
+sm-wget-en-US:
+	 $(NSINSTALL) -D $(ABS_DIST)/$(PKG_PATH)
+	(cd $(ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv --no-iri -N  '$(EN_US_BINARY_URL)/$(PACKAGE)')
+	@echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(ABS_DIST)/$(PKG_PATH)/$(PACKAGE)'
+ifdef RETRIEVE_WINDOWS_INSTALLER
+ifeq ($(OS_ARCH), WINNT)
+	$(NSINSTALL) -D $(ABS_DIST)/$(PKG_INST_PATH)
+	(cd $(ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv --no-iri -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe')
+	@echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe'
+endif
+endif
+
 # Add calendar targets for pattern rules. Unfortunately multiple pattern rules
 # on the left hand side do something different with make, therefore we need to
 # write a line for each target.
 calendar-merge-%:
 	$(run-calendar-rule)
 calendar-clobber-%:
 	$(run-calendar-rule)
 calendar-langpack-%:
 	$(run-calendar-rule)
 calendar-repackage-zip-%:
 	$(run-calendar-rule)
-calendar-wget-en-US:
+calendar-wget-en-US: sm-wget-en-US
 	$(run-calendar-rule)
 calendar-unpack:
 	$(run-calendar-rule)
 calendar-upload:
 	$(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
 
 # Hook into l10n.mk, providing extra arguments to l10n-repack.py
 ifdef NIGHTLY_BUILD
 MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
 else
 MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
 endif
 
 # Hook calendar targets to the mail non-pattern rules
 wget-en-US: calendar-wget-en-US
-unpack: calendar-unpack
-upload: calendar-upload
+unpack:: calendar-unpack
+upload:: calendar-upload
 
 # Hook into the pattern rules, this will be used later on in the installers-% target.
 CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
 endif
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.