wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1303 - Add langpack generation targets for Pale Moon and Basilisk

Browse source 
* 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)
This commit is contained in:
Matt A. Tobin 2019-11-28 00:17:32 -05:00 • committed by Roy Tam
commit 2ddb294c26
5 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
application/basilisk/build.mk
View file

@ -8,8 +8,11 @@ installer:
package: package:
@$(MAKE) -C application/basilisk/installer make-archive @$(MAKE) -C application/basilisk/installer make-archive
l10n-package:
@$(MAKE) -C application/palemoon/installer make-langpack
mozpackage: mozpackage:
@$(MAKE) -C application/basilisk/installer make-package @$(MAKE) -C application/basilisk/installer
package-compare: package-compare:
@$(MAKE) -C application/basilisk/installer package-compare @$(MAKE) -C application/basilisk/installer package-compare

6
application/basilisk/installer/Makefile.in
View file

@ -150,11 +150,15 @@ endif
# Builds using the hybrid FasterMake/RecursiveMake backend will # Builds using the hybrid FasterMake/RecursiveMake backend will
# fail to produce a langpack. See bug 1255096. # fail to produce a langpack. See bug 1255096.
libs:: make-langpack:
ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack $(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 endif
libs:: make-langpack
ifeq (WINNT,$(OS_ARCH)) ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS = PKGCOMP_FIND_OPTS =
else else

5
application/palemoon/build.mk
View file

@ -8,8 +8,11 @@ installer:
package: package:
@$(MAKE) -C application/palemoon/installer make-archive @$(MAKE) -C application/palemoon/installer make-archive
l10n-package:
@$(MAKE) -C application/palemoon/installer make-langpack
mozpackage: mozpackage:
@$(MAKE) -C application/palemoon/installer make-package @$(MAKE) -C application/palemoon/installer
package-compare: package-compare:
@$(MAKE) -C application/palemoon/installer package-compare @$(MAKE) -C application/palemoon/installer package-compare

11
application/palemoon/installer/Makefile.in
View file

@ -156,9 +156,16 @@ endif
endif endif
endif endif
# Builds using the hybrid FasterMake/RecursiveMake backend will
libs:: # fail to produce a langpack. See bug 1255096.
make-langpack:
ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
$(MAKE) -C $(DEPTH)/application/palemoon/locales langpack $(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)) ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS = PKGCOMP_FIND_OPTS =

9
python/mozbuild/mozbuild/mach_commands.py
View file

@ -1079,6 +1079,15 @@ class Stage_Package(MachCommandBase):
def stage_package(self): def stage_package(self):
return self._run_make(directory=".", target='stage-package', ensure_exit_code=False) 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 @CommandProvider
class Package(MachCommandBase): class Package(MachCommandBase):
"""Package the built product for distribution.""" """Package the built product for distribution."""