From 2ddb294c26778111c51f065b7bf80c4c3cb99570 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 28 Nov 2019 00:17:32 -0500
Subject: [PATCH] Issue #1303 - Add langpack generation targets for Pale Moon
 and Basilisk

* The langpack is not generated via the package target but IS for mozpackage target using old behavior
* Add mach command to specifically generate the langpack when needed without the rest of the packaging routine (mach langpack)
---
 application/basilisk/build.mk              |  5 ++++-
 application/basilisk/installer/Makefile.in |  6 +++++-
 application/palemoon/build.mk              |  5 ++++-
 application/palemoon/installer/Makefile.in | 11 +++++++++--
 python/mozbuild/mozbuild/mach_commands.py  |  9 +++++++++
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk
index f78105d9d..18bfb1f56 100644
--- a/application/basilisk/build.mk
+++ b/application/basilisk/build.mk
@@ -8,8 +8,11 @@ installer:
 package:
 	@$(MAKE) -C application/basilisk/installer make-archive
 
+l10n-package:
+	@$(MAKE) -C application/palemoon/installer make-langpack
+
 mozpackage:
-	@$(MAKE) -C application/basilisk/installer make-package
+	@$(MAKE) -C application/basilisk/installer
 
 package-compare:
 	@$(MAKE) -C application/basilisk/installer package-compare
diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in
index 586a6eac7..64273609a 100644
--- a/application/basilisk/installer/Makefile.in
+++ b/application/basilisk/installer/Makefile.in
@@ -150,11 +150,15 @@ endif
 
 # Builds using the hybrid FasterMake/RecursiveMake backend will
 # fail to produce a langpack. See bug 1255096.
-libs::
+make-langpack:
 ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack
+else
+	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
 endif
 
+libs:: make-langpack
+
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =
 else
diff --git a/application/palemoon/build.mk b/application/palemoon/build.mk
index 8c0dd03b9..d4532fab0 100644
--- a/application/palemoon/build.mk
+++ b/application/palemoon/build.mk
@@ -8,8 +8,11 @@ installer:
 package:
 	@$(MAKE) -C application/palemoon/installer make-archive
 
+l10n-package:
+	@$(MAKE) -C application/palemoon/installer make-langpack
+
 mozpackage:
-	@$(MAKE) -C application/palemoon/installer make-package
+	@$(MAKE) -C application/palemoon/installer
 
 package-compare:
 	@$(MAKE) -C application/palemoon/installer package-compare
diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in
index c02cdf96a..b3c4cdaba 100644
--- a/application/palemoon/installer/Makefile.in
+++ b/application/palemoon/installer/Makefile.in
@@ -156,9 +156,16 @@ endif
 endif
 endif
 
-
-libs::
+# Builds using the hybrid FasterMake/RecursiveMake backend will
+# fail to produce a langpack. See bug 1255096.
+make-langpack:
+ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	$(MAKE) -C $(DEPTH)/application/palemoon/locales langpack
+else
+	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
+endif
+
+libs:: make-langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 26c05ee91..5933a5aa9 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1079,6 +1079,15 @@ class Stage_Package(MachCommandBase):
     def stage_package(self):
         return self._run_make(directory=".", target='stage-package', ensure_exit_code=False)
 
+@CommandProvider
+class L10n_Package(MachCommandBase):
+    """Build and package l10n as a language pack xpi."""
+
+    @Command('langpack', category='post-build',
+        description='Build and package l10n as a language pack.')
+    def l10n_package(self):
+        return self._run_make(directory=".", target='l10n-package', ensure_exit_code=False)
+
 @CommandProvider
 class Package(MachCommandBase):
     """Package the built product for distribution."""