Commit e08ac68a authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

Backed out changeset 27f6228d4118 (bug 1390461) for frequently failing own... 

Backed out changeset 27f6228d4118 (bug 1390461) for frequently failing own check-clobber-l10n-x-test during build. r=backout on a CLOSED TREE
parent 8aac538e

browser/locales/Makefile.in

+1 −19
Original line number Diff line number Diff line
@@ -203,22 +203,4 @@ l10n-check:: 
	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' \

	    ZIP_IN='$(ZIP_IN)' MOZ_SIMPLE_PACKAGE_NAME=

	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH)

	(cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test)

	@# package langpack as web extension, too, run some tests on it

	$(MAKE) package-langpack-x-test L10NBASEDIR='$(PWD)' WEBEXT_LANGPACKS=1

	$(MAKE) analyze-langpack-x-test

	$(MAKE) check-clobber-l10n-x-test



# Helper rules to have AB_CD set to the locale we test for testing

# We need to split this out from l10n-check, as that needs AB_CD to be en-US

# at the top level to unpack the right file

analyze-langpack-%: AB_CD=$*

analyze-langpack-%:

	$(if $(shell unzip -qql $(ABS_DIST)/$(LANGPACK) manifest.json),$(info Found manifest.json),$(error manifest.json is missing))

	$(if $(shell unzip -qql $(ABS_DIST)/$(LANGPACK) chrome.manifest),$(error Found chrome.manifest),$(info Not packaging chrome.manifest))



check-clobber-l10n-%: AB_CD=$*

check-clobber-l10n-%:

	$(MAKE) clobber-x-test

	find $(ABS_DIST) -name \*$(AB_CD)\* -type f -delete

	$(RM) -r $(DIST)/l10n-stage $(UNPACKED_INSTALLER)
 
	cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test

toolkit/locales/l10n.mk

+9 −5
Original line number Diff line number Diff line
@@ -206,14 +206,18 @@ package-langpack-%: XPI_NAME=locale-$* 
package-langpack-%: AB_CD=$*

package-langpack-%:

	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)

ifdef WEBEXT_LANGPACKS

	$(call py_action,langpack_manifest,--locales $(AB_CD) --appver $(MOZ_APP_VERSION) --defines $(NEW_APP_DEFINES) --input $(DIST)/xpi-stage/locale-$(AB_CD))

	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json)

else

	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \

	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)

	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)

endif



langpack-webext-%: LANGPACK_FILE=$(ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi

langpack-webext-%: AB_CD=$*

langpack-webext-%: XPI_NAME=locale-$*

langpack-webext-%: libs-%

	@echo 'Making new-langpack $(LANGPACK_FILE)'

	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)

	$(call py_action,langpack_manifest,--locales $(AB_CD) --appver $(MOZ_APP_VERSION) --defines $(NEW_APP_DEFINES) --input $(DIST)/xpi-stage/locale-$(AB_CD))

	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json)



# This variable is to allow the wget-en-US target to know which ftp server to download from

ifndef EN_US_BINARY_URL