Bug 501794 download the windows installers only if a product declares RETRIEVE_WINDOWS_INSTALLER=1 in their /locales/Makefile.in file - r=ted
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Mon, 05 Oct 2009 17:04:18 -0400
changeset 33474 6f59af25b8253fb77ed912253214bc65aa1738ac
parent 33473 054909dfdcf84f7518c4592a3c572d8d5f5c4d71
child 33476 89d2bda1ab3730e7b6a995fdadf1cbc5d61f00b2
push id9533
push usercoop@mozilla.com
push dateMon, 05 Oct 2009 21:23:25 +0000
treeherdermozilla-central@6f59af25b825 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs501794
milestone1.9.3a1pre
Bug 501794 download the windows installers only if a product declares RETRIEVE_WINDOWS_INSTALLER=1 in their /locales/Makefile.in file - r=ted
browser/locales/Makefile.in
toolkit/locales/l10n.mk
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -77,16 +77,17 @@ APP_VERSION := $(shell cat $(srcdir)/../
 PWD := $(CURDIR)
 
 # These are defaulted to be compatible with the files the wget-en-US target
 # pulls. You may override them if you provide your own files. You _must_
 # override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
 # work in that case.
 ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
 WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+RETRIEVE_WINDOWS_INSTALLER = 1
 
 MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org
 
 ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
 DEFINES += -DEXTENSION_PREF
 endif
 
 PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/firefox-l10n.js) \
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -185,21 +185,23 @@ endif
 # The make installers-% target needs the en-US binary in dist/
 # and for the windows repackages we need the .installer.exe in dist/sea
 wget-en-US:
 ifndef WGET
 	$(error Wget not installed)
 endif
 	(cd $(_ABS_DIST) && $(WGET) -nv -N  $(EN_US_BINARY_URL)/$(PACKAGE))
 	@echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PACKAGE)"
+ifdef RETRIEVE_WINDOWS_INSTALLER
 ifeq ($(OS_ARCH), WINNT)
 	$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH)
 	(cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) -nv -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
 
 generate-snippet-%:
 	$(PYTHON) $(topsrcdir)/tools/update-packaging/generatesnippet.py \
           --mar-path=$(_ABS_DIST)/update \
           --application-ini-file=$(STAGEDIST)/application.ini \
           --locale=$* \
           --product=$(MOZ_PKG_APPNAME) \
           --download-base-URL=$(DOWNLOAD_BASE_URL) \