author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 13 Nov 2012 08:17:14 +0100 | |
changeset 113065 | 2b31de6440468683e51c55314fd81ac34d1d6cb9 |
parent 113064 | a06a34a849551211c9352c79d09678f31faa1e06 |
child 113066 | 6d47e2bedc07475b59f32cbc49dc30f70e0116f6 |
push id | 17923 |
push user | mh@glandium.org |
push date | Tue, 13 Nov 2012 07:21:33 +0000 |
treeherder | mozilla-inbound@d55265a97304 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | pike |
bugs | 809798 |
milestone | 19.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -79,22 +79,22 @@ install:: $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \ fi NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD)) libs-%: $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../toolkit/locales libs-$* + @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx $(MAKE) repackage-zip \
--- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -143,22 +143,22 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ done libs-%: $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../toolkit/locales libs-$* + @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx $(MAKE) repackage-zip \ AB_CD=$(AB_CD) \
--- a/mobile/android/locales/Makefile.in +++ b/mobile/android/locales/Makefile.in @@ -38,20 +38,20 @@ clobber-zip: # also clean up potential left-overs of multi-locale builds, notably # values-*/strings.xml. Those would be in the way of a single locale build, # which this target is for clobber-stage: $(RM) -rf $(STAGEDIST) $(RM) $(DEPTH)/mobile/android/base/res/values-*/strings.xml libs-%: - @$(MAKE) -C $(DEPTH)/mobile/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 + @$(MAKE) -C $(DEPTH)/mobile/locales libs-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref ifeq ($(OS_TARGET),Android) - @$(MAKE) -C $(DEPTH)/mobile/android/base/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -C $(DEPTH)/mobile/android/base/locales AB_CD=$* XPI_NAME=locale-$* endif # Tailored target to just add the chrome processing for multi-locale builds chrome-%: @$(MAKE) -C $(DEPTH)/mobile/locales chrome-$* @$(MAKE) chrome AB_CD=$* ifeq ($(OS_TARGET),Android) @$(MAKE) -C $(DEPTH)/mobile/android/base/locales chrome-$*
--- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -159,23 +159,23 @@ include $(topsrcdir)/config/rules.mk ############# libs-preqs =\ $(call mkdir-deps,$(DIST)/install) \ $(NULL) libs-%: $(libs-preqs) $(display-deps) - @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* + @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -B $(bookmarks) AB_CD=$* @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* # Tailored target to just add the chrome processing for multi-locale builds chrome-%: $(display-deps) @$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$* @$(MAKE) -C $(DEPTH)/services/sync/locales chrome AB_CD=$* @$(MAKE) -B $(bookmarks) AB_CD=$* @$(MAKE) -B searchplugins AB_CD=$*
--- a/mobile/xul/locales/Makefile.in +++ b/mobile/xul/locales/Makefile.in @@ -42,18 +42,18 @@ clobber-zip: $(STAGEDIST)/chrome/$(AB_CD).manifest \ $(STAGEDIST)/defaults/preferences/mobile-l10n.js $(RM) -r $(STAGEDIST)/dictionaries \ $(STAGEDIST)/hyphenation \ $(STAGEDIST)/defaults/profile \ $(STAGEDIST)/chrome/$(AB_CD) libs-%: - @$(MAKE) -C $(DEPTH)/mobile/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/preferences BOTH_MANIFESTS=1 + @$(MAKE) -C $(DEPTH)/mobile/locales libs-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/preferences # Tailored target to just add the chrome processing for multi-locale builds chrome-%: @$(MAKE) -C $(DEPTH)/mobile/locales chrome-$* @$(MAKE) chrome AB_CD=$* ifeq ($(OS_TARGET),Android) @$(MAKE) -C $(DEPTH)/embedding/android chrome AB_CD=$* endif
--- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -10,18 +10,16 @@ # makefile defines the following targets: # clobber-zip # This target should remove all language dependent-files from $(STAGEDIST), # depending on $(AB_CD) set to the locale code. # $(AB_CD) will be en-US on the initial unpacking of the package # libs-% # This target should call into the various libs targets that this # application depends on. -# Make sure to set BOTH_MANIFESTS=1, as this will be called only once -# for both packages and language packs. # installer-% # This target should list all required targets, a typical rule would be # installers-%: clobber-% langpack-% repackage-zip-% # @echo "repackaging done" # to initially clobber the locale staging area, and then to build the # language pack and zip package. # Other targets like windows installers might be listed, too, and should # be defined in the including makefile. @@ -166,17 +164,17 @@ TK_DEFINES = $(firstword \ langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi langpack-%: AB_CD=$* langpack-%: XPI_NAME=locale-$* langpack-%: libs-% @echo "Making langpack $(LANGPACK_FILE)" $(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH) $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) -I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ - $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest -x chrome/$(AB_CD).manifest + $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest # This variable is to allow the wget-en-US target to know which ftp server to download from ifndef EN_US_BINARY_URL EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL) endif # This make target allows us to wget the latest en-US binary from a specified website