From f8cf1bb3b432921e23e44f0a8f3df772d6cec5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Tue, 3 May 2022 22:55:47 +0200 Subject: [PATCH] add command to package locales --- assets/linux.mk | 4 ++-- assets/macos.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/linux.mk b/assets/linux.mk index 4d8ba4c..2383bb9 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -18,9 +18,9 @@ build : $(outfile) $(outfile).sha256sum $(outfile) : ${MAKE} work ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(distro) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) diff --git a/assets/macos.mk b/assets/macos.mk index 200047a..5340556 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -18,9 +18,9 @@ $(outfile) $(outfile).sha256sum : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package) else - docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales && ./mach package" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum