diff options
| -rw-r--r-- | application/basilisk/build.mk | 5 | ||||
| -rw-r--r-- | application/basilisk/installer/Makefile.in | 6 | ||||
| -rw-r--r-- | application/palemoon/build.mk | 5 | ||||
| -rw-r--r-- | application/palemoon/installer/Makefile.in | 11 | ||||
| -rw-r--r-- | 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 ef7df8bf4..ddd1c71cf 100644 --- a/application/basilisk/installer/Makefile.in +++ b/application/basilisk/installer/Makefile.in @@ -147,11 +147,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 @@ -1080,6 +1080,15 @@ class Stage_Package(MachCommandBase): 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.""" |