bug 1370506, add l10n-related targets to top-level build.mk, r?glandium draft
authorAxel Hecht <axel@pike.org>
Fri, 16 Jun 2017 12:13:55 +0200
changeset 619229 6daafc2ffce5659973bea10b19bb9eb36cfb78da
parent 619228 fded0da4224f19b0a7d6bf0d8d494d7417a52d06
child 619230 921def518cb9e17fce3e8ba3f09f2b36fcf9756a
push id71621
push useraxel@mozilla.com
push dateTue, 01 Aug 2017 19:49:47 +0000
reviewersglandium
bugs1370506
milestone56.0a1
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