librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

last changes to integrate flatpak into main makefile

Browse source
This commit is contained in:
Bert van der Weerd 2022-10-24 15:06:24 +02:00
parent d1e12410fe
commit 8351822c32
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
2 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -228,13 +228,13 @@ docker-flatpak : docker-flatpak-x86_64
flatpak : flatpak-x86_64 flatpak : flatpak-x86_64
docker-flatpak-x86_64 : docker-flatpak-x86_64 :
${MAKE} -f assets/flatpak.mk arch=x86_64 docker ${MAKE} -C flatpak arch=x86_64 docker-build
docker-flatpak-aarch64 : docker-flatpak-aarch64 :
${MAKE} -f assets/flatpak.mk arch=aarch64 docker ${MAKE} -C flatpak arch=aarch64 docker-build
flatpak-x86_64 : flatpak-x86_64 :
${MAKE} -f assets/flatpak.mk arch=x86_64 build ${MAKE} -C flatpak arch=x86_64 docker-run
flatpak-aarch64 : flatpak-aarch64 :
${MAKE} -f assets/flatpak.mk arch=aarch64 build ${MAKE} -C flatpak arch=aarch64 docker-run
# #
# Docker in Docker (for GitLab CI) # Docker in Docker (for GitLab CI)

30
assets/flatpak.mk
View file

@ -1,30 +0,0 @@
# $(arch)
# $(use_docker)
.PHONY : docker build
version:=$(shell cat version)
release:=$(shell cat release)
source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
docker :
docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) - < assets/macos.Dockerfile
build : $(outfile) $(outfile).sha256sum
$(outfile) :
${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 && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
else
docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
endif
cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)
$(outfile).sha256sum : $(outfile)
sha256sum $(outfile) > $(outfile).sha256sum
cat $(outfile).sha256sum