From fb3b0075d1a9c4dafbdf339b835d462b5ae55a0e Mon Sep 17 00:00:00 2001 From: Mike Shal Date: Fri, 13 Mar 2020 18:34:28 +0000 Subject: [PATCH] Bug 1607193 - Remove l10n-check; r=firefox-build-system-reviewers,rstewart Depends on D66715 Differential Revision: https://phabricator.services.mozilla.com/D66716 --HG-- extra : moz-landing-system : lando --- browser/build.mk | 2 +- browser/locales/Makefile.in | 16 ---------------- toolkit/mozapps/installer/upload-files.mk | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/browser/build.mk b/browser/build.mk index 38f8650d9756..ea23ff88968e 100644 --- a/browser/build.mk +++ b/browser/build.mk @@ -32,7 +32,7 @@ source-upload:: hg-bundle:: @$(MAKE) -C browser/installer hg-bundle -l10n-check wget-en-US: +wget-en-US: @$(MAKE) -C browser/locales $@ # make -j1 because dependencies in l10n build targets don't work diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index d73d1534e723..6bf0246d5f61 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -111,19 +111,3 @@ ident: @printf 'buildid ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \ '$(STAGEDIST)'/application.ini App BuildID - -# test target, depends on make package -# try to repack x-test, with just toolkit/defines.inc being there -l10n-check:: INNER_UNMAKE_PACKAGE=true -l10n-check:: - $(RM) -rf x-test - $(NSINSTALL) -D x-test/toolkit - echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc - @# ZIP_IN='$(ZIP_IN)' will pass down the *current* value of ZIP_IN, and - @# we do the same for WIN32_INSTALLER_IN, which are based on MOZ_SIMPLE_PACKAGE_NAME - @# not being reset, overwriting the value they would get with MOZ_SIMPLE_PACKAGE_NAME - @# reset. - $(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 diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 80f622104964..7a4d5e379153 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -387,7 +387,7 @@ UPLOAD_FILES= \ $(call QUOTED_WILDCARD,$(topobjdir)/config.status) \ $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f)))) -ifneq ($(filter-out en-US x-test,$(AB_CD)),) +ifneq ($(filter-out en-US,$(AB_CD)),) UPLOAD_FILES += \ $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/l10ngen/setup.exe) \ $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/l10ngen/setup-stub.exe)