diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-28 00:17:32 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-28 00:17:32 -0500 |
| commit | 064790189c1930067e2c78bbeb2a9488e1f45f57 (patch) | |
| tree | 3b6b4358ca4fb9ca326a280932aafab5c5dca920 /application | |
| parent | 52cb294d2a5408d5eac6ac4ad5285165c6877932 (diff) | |
| download | UXP-064790189c1930067e2c78bbeb2a9488e1f45f57.tar UXP-064790189c1930067e2c78bbeb2a9488e1f45f57.tar.gz UXP-064790189c1930067e2c78bbeb2a9488e1f45f57.tar.lz UXP-064790189c1930067e2c78bbeb2a9488e1f45f57.tar.xz UXP-064790189c1930067e2c78bbeb2a9488e1f45f57.zip | |
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)
Diffstat (limited to 'application')
| -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 |
4 files changed, 22 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 = |