localized-generated-files-backend.diff

 0:00.12 /build/debug-mozilla-central/_virtualenv/bin/python /build/debug-mozilla-central/config.status --diff
--- /build/debug-mozilla-central/backend.RecursiveMakeBackend.in
+++ /build/debug-mozilla-central/backend.RecursiveMakeBackend.in
@@ -340,9 +340,8 @@
 /build/mozilla-central/config/stl-headers.mozbuild
 /build/mozilla-central/config/system-headers.mozbuild
 /build/mozilla-central/config/tests/python.ini
 /build/mozilla-central/config/tests/src-simple/Makefile.in
-/build/mozilla-central/configure.py
 /build/mozilla-central/db/sqlite3/src/moz.build
 /build/mozilla-central/devtools/client/aboutdebugging/components/addons/moz.build
 /build/mozilla-central/devtools/client/aboutdebugging/components/moz.build
 /build/mozilla-central/devtools/client/aboutdebugging/components/tabs/moz.build
@@ -1903,13 +1902,8 @@
 /build/mozilla-central/python/mozbuild/mozbuild/backend/fastermake.py
 /build/mozilla-central/python/mozbuild/mozbuild/backend/recursivemake.py
 /build/mozilla-central/python/mozbuild/mozbuild/base.py
 /build/mozilla-central/python/mozbuild/mozbuild/config_status.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/__init__.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/constants.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/help.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/options.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/util.py
 /build/mozilla-central/python/mozbuild/mozbuild/controller/__init__.py
 /build/mozilla-central/python/mozbuild/mozbuild/controller/clobber.py
 /build/mozilla-central/python/mozbuild/mozbuild/frontend/__init__.py
 /build/mozilla-central/python/mozbuild/mozbuild/frontend/context.py
--- /build/debug-mozilla-central/browser/locales/Makefile
+++ /build/debug-mozilla-central/browser/locales/Makefile
@@ -158,25 +158,8 @@
 	@$(MAKE) package-win32-installer AB_CD=$* MOZ_PKG_FORMAT=SFX7Z
 endif
 	@echo 'repackaging done'
 
-ifdef MOZ_UPDATER
-# Note that we want updater.ini to be in the top directory, not the browser/
-# subdirectory, because that's where the updater is installed and runs.
-libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
-ifeq ($(OS_ARCH),WINNT)
-	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
-	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
-	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
-	  $(FINAL_TARGET)/../updater.ini
-else
-	cat $< | \
-	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
-	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
-	  $(FINAL_TARGET)/../updater.ini
-endif
-endif
-
 ident:
 	@printf 'fx_revision '
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
 	    $(STAGEDIST)/application.ini App SourceStamp
--- /build/debug-mozilla-central/browser/locales/backend.mk
+++ /build/debug-mozilla-central/browser/locales/backend.mk
@@ -2,12 +2,24 @@
 
 DEFINES += -DDEBUG=1
 DIST_SUBDIR = browser
 FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)$(DIST_SUBDIR:%=/%)
+libs:: updater.ini
+updater.ini: $(if $(IS_LANGUAGE_REPACK),FORCE)
+GARBAGE += updater.ini
+EXTRA_MDDEPEND_FILES += updater.ini.pp
+updater.ini: /build/mozilla-central/browser/locales/generate_updater_ini.py $(call MERGE_FILE,updater/updater.ini) $(topsrcdir)/browser/installer/windows/nsis/updater_append.ini
+	$(REPORT_BUILD)
+	$(call py_action,file_generate,--locale=$(AB_CD) /build/mozilla-central/browser/locales/generate_updater_ini.py main updater.ini $(MDDEPDIR)/updater.ini.pp $(call MERGE_FILE,updater/updater.ini) $(topsrcdir)/browser/installer/windows/nsis/updater_append.ini)
+
 LOCALIZED_FILES_0_FILES += $(call MERGE_FILE,crashreporter/crashreporter-override.ini)
 LOCALIZED_FILES_0_DEST = $(FINAL_TARGET)/
 LOCALIZED_FILES_0_TARGET := libs
 INSTALL_TARGETS += LOCALIZED_FILES_0
+LOCALIZED_FILES_1_FILES += updater.ini
+LOCALIZED_FILES_1_DEST = $(FINAL_TARGET)/..
+LOCALIZED_FILES_1_TARGET := libs
+INSTALL_TARGETS += LOCALIZED_FILES_1
 LOCALIZED_PP_FILES_0 += $(call MERGE_FILE,firefox-l10n.js)
 LOCALIZED_PP_FILES_0_PATH = $(FINAL_TARGET)/defaults/preferences
 LOCALIZED_PP_FILES_0_TARGET := libs
 LOCALIZED_PP_FILES_0_FLAGS := --silence-missing-directive-warnings
--- /build/debug-mozilla-central/toolkit/locales/Makefile
+++ /build/debug-mozilla-central/toolkit/locales/Makefile
@@ -28,8 +28,5 @@
 	@$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*
 
-libs:: update.locale
-	sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale
-
 include $(topsrcdir)/config/recurse.mk
--- /build/debug-mozilla-central/toolkit/locales/backend.mk
+++ /build/debug-mozilla-central/toolkit/locales/backend.mk
@@ -7,13 +7,22 @@
 multilocale.json: /build/mozilla-central/toolkit/locales/gen_multilocale.py
 	$(REPORT_BUILD)
 	$(call py_action,file_generate,/build/mozilla-central/toolkit/locales/gen_multilocale.py main multilocale.json $(MDDEPDIR)/multilocale.json.pp)
 
+libs:: update.locale
+update.locale: $(if $(IS_LANGUAGE_REPACK),FORCE)
+GARBAGE += update.locale
+EXTRA_MDDEPEND_FILES += update.locale.pp
+update.locale: /build/mozilla-central/toolkit/locales/generate_update_locale.py
+	$(REPORT_BUILD)
+	$(call py_action,file_generate,--locale=$(AB_CD) /build/mozilla-central/toolkit/locales/generate_update_locale.py main update.locale $(MDDEPDIR)/update.locale.pp)
+
 dist_bin_res_FILES += multilocale.json
 dist_bin_res_DEST := $(DEPTH)/dist/bin/res
 dist_bin_res_TARGET := misc
 INSTALL_TARGETS += dist_bin_res
 LOCALIZED_FILES_0_FILES += $(call MERGE_FILE,crashreporter/crashreporter.ini)
+LOCALIZED_FILES_0_FILES += update.locale
 LOCALIZED_FILES_0_DEST = $(FINAL_TARGET)/
 LOCALIZED_FILES_0_TARGET := libs
 INSTALL_TARGETS += LOCALIZED_FILES_0
 JAR_MANIFEST := /build/mozilla-central/toolkit/locales/jar.mn
--- /build/debug-mozilla-central/backend.FasterMakeBackend.in
+++ /build/debug-mozilla-central/backend.FasterMakeBackend.in
@@ -57,8 +57,9 @@
 /build/debug-mozilla-central/_virtualenv/lib/python2.7/sre_parse.py
 /build/debug-mozilla-central/_virtualenv/lib/python2.7/stat.py
 /build/debug-mozilla-central/_virtualenv/lib/python2.7/types.py
 /build/debug-mozilla-central/_virtualenv/lib/python2.7/warnings.py
+/build/debug-mozilla-central/config.status
 /build/debug-mozilla-central/js/src/config.status
 /build/mozilla-central/accessible/jsat/jar.mn
 /build/mozilla-central/browser/base/jar.mn
 /build/mozilla-central/browser/branding/unofficial/content/jar.mn
@@ -101,9 +102,8 @@
 /build/mozilla-central/browser/themes/linux/jar.mn
 /build/mozilla-central/browser/themes/shared/jar.inc.mn
 /build/mozilla-central/build/mach_bootstrap.py
 /build/mozilla-central/config/MozZipFile.py
-/build/mozilla-central/configure.py
 /build/mozilla-central/devtools/client/jar.mn
 /build/mozilla-central/devtools/client/locales/jar.mn
 /build/mozilla-central/devtools/client/webide/content/jar.mn
 /build/mozilla-central/devtools/client/webide/themes/jar.mn
@@ -150,13 +150,8 @@
 /build/mozilla-central/python/mozbuild/mozbuild/backend/fastermake.py
 /build/mozilla-central/python/mozbuild/mozbuild/backend/recursivemake.py
 /build/mozilla-central/python/mozbuild/mozbuild/base.py
 /build/mozilla-central/python/mozbuild/mozbuild/config_status.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/__init__.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/constants.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/help.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/options.py
-/build/mozilla-central/python/mozbuild/mozbuild/configure/util.py
 /build/mozilla-central/python/mozbuild/mozbuild/controller/__init__.py
 /build/mozilla-central/python/mozbuild/mozbuild/controller/clobber.py
 /build/mozilla-central/python/mozbuild/mozbuild/frontend/__init__.py
 /build/mozilla-central/python/mozbuild/mozbuild/frontend/context.py
--- /build/debug-mozilla-central/faster/Makefile
+++ /build/debug-mozilla-central/faster/Makefile
@@ -5,6 +5,7 @@
 ACDEFINES = -DA11Y_LOG=1 -DACCESSIBILITY=1 -DATK_MAJOR_VERSION=2 -DATK_MINOR_VERSION=26 -DATK_REV_VERSION=0 -DBUILD_CTYPES=1 -DCROSS_COMPILE='' -DD_INO=d_ino -DEARLY_BETA_OR_EARLIER=1 -DENABLE_INTL_API=1 -DENABLE_SYSTEM_EXTENSION_DIRS=1 -DENABLE_TESTS=1 -DEXPOSE_INTL_API=1 -DFIREFOX_VERSION=59.0a1 -DFORCE_PR_LOG=1 -DFUNCPROTO=15 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DGL_PROVIDER_GLX=1 -DGTEST_HAS_RTTI=0 -DHAVE_64BIT_BUILD=1 -DHAVE_ALLOCA_H=1 -DHAVE_BYTESWAP_H=1 -DHAVE_CLOCK_MONOTONIC=1 -DHAVE_CPUID_H=1 -DHAVE_DIRENT_H=1 -DHAVE_DLADDR=1 -DHAVE_DLOPEN=1 -DHAVE_FONTCONFIG_FCFREETYPE_H=1 -DHAVE_FT_BITMAP_SIZE_Y_PPEM=1 -DHAVE_FT_GLYPHSLOT_EMBOLDEN=1 -DHAVE_FT_LOAD_SFNT_TABLE=1 -DHAVE_GETOPT_H=1 -DHAVE_GMTIME_R=1 -DHAVE_I18N_LC_MESSAGES=1 -DHAVE_INTTYPES_H=1 -DHAVE_LANGINFO_CODESET=1 -DHAVE_LCHOWN=1 -DHAVE_LIBXSS=1 -DHAVE_LINUX_IF_ADDR_H=1 -DHAVE_LINUX_PERF_EVENT_H=1 -DHAVE_LINUX_QUOTA_H=1 -DHAVE_LINUX_RTNETLINK_H=1 -DHAVE_LOCALECONV=1 -DHAVE_LOCALTIME_R=1 -DHAVE_LSTAT64=1 -DHAVE_MALLINFO=1 -DHAVE_MALLOC_H=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_MEMALIGN=1 -DHAVE_MEMMEM=1 -DHAVE_NETINET_IN_H=1 -DHAVE_NL_TYPES_H=1 -DHAVE_POSIX_FADVISE=1 -DHAVE_POSIX_FALLOCATE=1 -DHAVE_POSIX_MEMALIGN=1 -DHAVE_PTHREAD_H=1 -DHAVE_RES_NINIT=1 -DHAVE_SETPRIORITY=1 -DHAVE_STAT64=1 -DHAVE_STDINT_H=1 -DHAVE_STRERROR=1 -DHAVE_STRNDUP=1 -DHAVE_SYSCALL=1 -DHAVE_SYS_QUEUE_H=1 -DHAVE_SYS_QUOTA_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_THREAD_TLS_KEYWORD=1 -DHAVE_TRUNCATE64=1 -DHAVE_UNISTD_H=1 -DHAVE_VALLOC=1 -DHAVE_VA_COPY=1 -DHAVE_VA_LIST_AS_ARRAY=1 -DHAVE_VISIBILITY_ATTRIBUTE=1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=1 -DHAVE__UNWIND_BACKTRACE=1 -DHAVE___CXA_DEMANGLE=1 -DJS_DEFAULT_JITREPORT_GRANULARITY=3 -DMALLOC_H='<malloc.h>' -DMALLOC_USABLE_SIZE_CONST_PTR='' -DMOZILLA_UAVERSION='"59.0"' -DMOZILLA_VERSION='"59.0a1"' -DMOZILLA_VERSION_U=59.0a1 -DMOZ_ACCESSIBILITY_ATK=1 -DMOZ_ADDON_SIGNING=1 -DMOZ_ALLOW_LEGACY_EXTENSIONS=1 -DMOZ_APP_UA_NAME='""' -DMOZ_APP_UA_VERSION='"59.0a1"' -DMOZ_AV1=1 -DMOZ_BUILD_APP=browser -DMOZ_BUILD_WEBRENDER=1 -DMOZ_BUNDLED_FONTS=1 -DMOZ_CONTENT_SANDBOX=1 -DMOZ_CRASHREPORTER=1 -DMOZ_DATA_REPORTING=1 -DMOZ_DEBUG=1 -DMOZ_DEBUG_RUST=1 -DMOZ_DEMANGLE_SYMBOLS=1 -DMOZ_DISTRIBUTION_ID='"org.mozilla"' -DMOZ_DLL_SUFFIX='".so"' -DMOZ_DUMP_PAINTING=1 -DMOZ_ENABLE_DBUS=1 -DMOZ_ENABLE_GCONF=1 -DMOZ_ENABLE_SIGNMAR=1 -DMOZ_ENABLE_SKIA=1 -DMOZ_ENABLE_SKIA_PDF=1 -DMOZ_ENABLE_SKIA_PDF_SFNTLY=1 -DMOZ_ENABLE_XREMOTE=1 -DMOZ_FEEDS=1 -DMOZ_FFMPEG=1 -DMOZ_FFVPX=1 -DMOZ_FMP4=1 -DMOZ_GECKO_PROFILER=1 -DMOZ_GLUE_IN_PROGRAM=1 -DMOZ_GMP_SANDBOX=1 -DMOZ_INSTRUMENT_EVENT_LOOP=1 -DMOZ_LIBAV_FFT=1 -DMOZ_LOGGING=1 -DMOZ_MACBUNDLE_ID=org.mozilla.nightlydebug -DMOZ_MEMORY=1 -DMOZ_PEERCONNECTION=1 -DMOZ_PERMISSIONS=1 -DMOZ_PHOENIX=1 -DMOZ_PLACES=1 -DMOZ_PROFILING=1 -DMOZ_PULSEAUDIO=1 -DMOZ_RAW=1 -DMOZ_REFLOW_PERF=1 -DMOZ_REFLOW_PERF_DSP=1 -DMOZ_REPLACE_MALLOC=1 -DMOZ_SAMPLE_TYPE_FLOAT32=1 -DMOZ_SANDBOX=1 -DMOZ_SCTP=1 -DMOZ_SECUREELEMENT=1 -DMOZ_SERVICES_HEALTHREPORT=1 -DMOZ_SRTP=1 -DMOZ_STATIC_JS=1 -DMOZ_STYLO=1 -DMOZ_STYLO_ENABLE=1 -DMOZ_TREE_CAIRO=1 -DMOZ_TREE_PIXMAN=1 -DMOZ_UPDATER=1 -DMOZ_UPDATE_CHANNEL=default -DMOZ_USER_DIR='".mozilla"' -DMOZ_VORBIS=1 -DMOZ_VPX_NO_MEM_REPORTING=1 -DMOZ_VTUNE=1 -DMOZ_WEBM_ENCODER=1 -DMOZ_WEBRTC=1 -DMOZ_WEBRTC_ASSERT_ALWAYS=1 -DMOZ_WEBRTC_SIGNALING=1 -DMOZ_WEBSPEECH=1 -DMOZ_WEBSPEECH_TEST_BACKEND=1 -DMOZ_WIDGET_GTK=3 -DMOZ_X11=1 -DMOZ_XUL=1 -DNIGHTLY_BUILD=1 -DNO_NSPR_10_SUPPORT=1 -DNS_PRINTING=1 -DNS_PRINT_PREVIEW=1 -DSTATIC_JS_API=1 -DSTDC_HEADERS=1 -DTARGET_XPCOM_ABI='"x86_64-gcc3"' -DUSE_SKIA=1 -DUSE_SKIA_GPU=1 -DU_STATIC_IMPLEMENTATION=1 -DU_USING_ICU_NAMESPACE=0 -DVA_COPY=va_copy -DVPX_X86_ASM=1 -DXP_LINUX=1 -DXP_UNIX=1 -D_REENTRANT=1
 MOZ_BUILD_APP = browser
 MOZ_WIDGET_TOOLKIT = gtk3
 INSTALL_MANIFESTS = dist/bin dist/bin/gmp-fake/1.0 dist/bin/gmp-fakeopenh264/1.0 dist/bin/browser dist/bin/gmp-clearkey/0.1 dist/bin/browser/localization dist/bin/browser/features/activity-stream@mozilla.org dist/bin/browser/features/followonsearch@mozilla.com dist/bin/browser/features/formautofill@mozilla.org dist/bin/browser/features/onboarding@mozilla.org dist/bin/browser/features/firefox@getpocket.com dist/bin/browser/features/shield-recipe-client@mozilla.org dist/bin/browser/features/webcompat@mozilla.org dist/bin/browser/features/flyweb@mozilla.org dist/bin/browser/features/presentation@mozilla.org dist/bin/browser/features/webcompat-reporter@mozilla.org dist/bin/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-install-dist/bin: $(TOPOBJDIR)/build/application.ini $(TOPOBJDIR)/toolkit/locales/multilocale.json $(TOPOBJDIR)/toolkit/library/dependentlibs.list $(TOPOBJDIR)/toolkit/library/dependentlibs.list.gtest
+install-dist/bin: $(TOPOBJDIR)/build/application.ini $(TOPOBJDIR)/toolkit/locales/multilocale.json $(TOPOBJDIR)/toolkit/locales/update.locale $(TOPOBJDIR)/toolkit/library/dependentlibs.list $(TOPOBJDIR)/toolkit/library/dependentlibs.list.gtest
+install-dist/bin/browser: $(TOPOBJDIR)/browser/locales/updater.ini
 include $(TOPSRCDIR)/config/faster/rules.mk
--- /build/debug-mozilla-central/faster/install_dist_bin
+++ /build/debug-mozilla-central/faster/install_dist_bin
@@ -1415,4 +1415,5 @@
 1res/table-remove-row.gif/build/mozilla-central/editor/composer/res/table-remove-row.gif
 1res/test.properties/build/mozilla-central/xpcom/tests/test.properties
 1run-mozilla.sh/build/mozilla-central/build/unix/run-mozilla.sh
 7update-settings.ini/build/mozilla-central/build/update-settings.ini/build/debug-mozilla-central/faster/.deps/dist_bin_update-settings.ini#{"ACCEPTED_MAR_CHANNEL_IDS": "firefox-mozilla-central", "DEBUG": 1, "topsrcdir": "/build/mozilla-central"}0
+1update.locale/build/debug-mozilla-central/toolkit/locales/update.locale
--- /build/debug-mozilla-central/faster/install_dist_bin_browser
+++ /build/debug-mozilla-central/faster/install_dist_bin_browser
@@ -1,5 +1,6 @@
 5
+1../updater.ini/build/debug-mozilla-central/browser/locales/updater.ini
 5/build/mozilla-central/browser/extensions/pdfjs/content/*/chrome/pdfjs/content//build/mozilla-central/browser/extensions/pdfjs/content/*chrome/pdfjs/content/
 5/build/mozilla-central/browser/locales/searchplugins/*.xml/chrome/en-US/locale/browser/searchplugins//build/mozilla-central/browser/locales/searchplugins/*.xmlchrome/en-US/locale/browser/searchplugins/
 5/build/mozilla-central/devtools/client/locales/en-US/*/chrome/en-US/locale/en-US/devtools/client//build/mozilla-central/devtools/client/locales/en-US/*chrome/en-US/locale/en-US/devtools/client/
 5/build/mozilla-central/devtools/shared/locales/en-US/*/chrome/en-US/locale/en-US/devtools/shared//build/mozilla-central/devtools/shared/locales/en-US/*chrome/en-US/locale/en-US/devtools/shared/