bug 1370506, add l10n-related targets to top-level build.mk, r=glandium
authorAxel Hecht <axel@pike.org>
Fri, 16 Jun 2017 12:13:55 +0200
changeset 372558 0ef6d21da19021b9547de282145b2ef5d85d3851
parent 372557 64a69b2cebbbbdb4f40133eff0f1711756d89a66
child 372559 0fdb6a37c65caaffbcf04834589c13bda0b96cd4
push id32278
push userarchaeopteryx@coole-files.de
push dateThu, 03 Aug 2017 09:44:16 +0000
treeherdermozilla-central@681a2489f6a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1370506
milestone57.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
bug 1370506, add l10n-related targets to top-level build.mk, r=glandium These rules are just convenience, both for developers and automation. Instead of having to hard-code to run make in a particular directory to do l10n-repacks, you can now just do ./mach build installers-de and that's that. MozReview-Commit-ID: C4WKXljjN7n
browser/build.mk
mobile/android/build.mk
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -30,18 +30,23 @@ upload::
 	@$(MAKE) -C browser/installer upload
 
 source-upload::
 	@$(MAKE) -C browser/installer source-upload
 
 hg-bundle::
 	@$(MAKE) -C browser/installer hg-bundle
 
-l10n-check::
-	@$(MAKE) -C browser/locales l10n-check
+l10n-check wget-en-US:
+	@$(MAKE) -C browser/locales $@
+
+# make -j1 because dependencies in l10n build targets don't work
+# with parallel builds
+merge-% installers-% langpack-% chrome-%:
+	$(MAKE) -j1 -C browser/locales $@
 
 ifdef ENABLE_TESTS
 # Implemented in testing/testsuite-targets.mk
 
 mochitest-browser-chrome:
 	$(RUN_MOCHITEST) --flavor=browser
 	$(CHECK_TEST_ERROR)
 
--- a/mobile/android/build.mk
+++ b/mobile/android/build.mk
@@ -46,16 +46,25 @@ else
 endif
 
 deb: package
 	@$(MAKE) -C mobile/android/installer deb
 
 upload::
 	@$(MAKE) -C mobile/android/installer upload
 
+wget-en-US:
+	@$(MAKE) -C mobile/android/locales $@
+
+# make -j1 because dependencies in l10n build targets don't work
+# with parallel builds
+# Not exposing langpack-% because that doesn't work on Android
+merge-% installers-% chrome-%:
+	$(MAKE) -j1 -C mobile/android/locales $@
+
 ifdef ENABLE_TESTS
 # Implemented in testing/testsuite-targets.mk
 
 mochitest-browser-chrome:
 	$(RUN_MOCHITEST) --flavor=browser
 	$(CHECK_TEST_ERROR)
 
 mochitest:: mochitest-browser-chrome