Browse Source

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)
pull/24/head
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
2ddb294c26
  1. 5
      application/basilisk/build.mk
  2. 6
      application/basilisk/installer/Makefile.in
  3. 5
      application/palemoon/build.mk
  4. 11
      application/palemoon/installer/Makefile.in
  5. 9
      python/mozbuild/mozbuild/mach_commands.py

5
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

6
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

5
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

11
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 =

9
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."""

Loading…
Cancel
Save