From 4b01e8fbe017125ae9f031500ef52c1bce8d7274 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 8 Feb 2022 10:17:22 +0100
Subject: [PATCH] started with deb+rpm stuff, other changes

---
 Makefile                  | 36 +++++++++++++++++++++++++++++++++++-
 assets/linux.Dockerfile   |  7 +++----
 assets/linux.artifacts.mk | 18 ++++++++++++++++++
 assets/linux.mk           |  3 ++-
 assets/macos.Dockerfile   |  2 +-
 source_release            |  2 +-
 6 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 assets/linux.artifacts.mk

diff --git a/Makefile b/Makefile
index cf47cb2..9bf7f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,36 @@ build :
 	${MAKE} clean
 	${MAKE} macos-x86_64
 	${MAKE} clean
-	${MAKE} fedora35
 	${MAKE} macos-aarch64
+	${MAKE} clean
+
+
+full-build :
+	${MAKE} docker-debian11
+	${MAKE} clean
+	${MAKE} debian11
+	${MAKE} docker-mint20
+	${MAKE} clean
+	${MAKE} mint20
+	${MAKE} docker-ubuntu20
+	${MAKE} clean
+	${MAKE} ubuntu20
+	${MAKE} docker-ubuntu21
+	${MAKE} clean
+	${MAKE} ubuntu21
+	${MAKE} docker-fedora34
+	${MAKE} clean
+	${MAKE} fedora34
+	${MAKE} docker-fedora35
+	${MAKE} clean
+	${MAKE} fedora35
+	${MAKE} docker-macos-x86_64
+	${MAKE} clean
+	${MAKE} macos-x86_64
+	${MAKE} docker-macos-aarch64
+	${MAKE} clean
+	${MAKE} macos-aarch64
+	${MAKE} clean
 
 push :
 	docker push librewolf/bsys5-image-debian11
@@ -98,31 +126,37 @@ docker-debian11 :
 	${MAKE} -f assets/linux.mk distro=debian11 "distro_image=debian:bullseye" docker
 debian11 : work
 	${MAKE} -f assets/linux.mk distro=debian11 build
+	${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
 ## mint20
 docker-mint20 :
 	${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
 mint20 : work
 	${MAKE} -f assets/linux.mk distro=mint20 build
+	${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb
 ## ubuntu20
 docker-ubuntu20 :
 	${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
 ubuntu20 : work
 	${MAKE} -f assets/linux.mk distro=ubuntu20 build
+	${MAKE} -f assets/linux.artifacts.mk distro=ubuntu20 artifacts-deb
 ## ubuntu21
 docker-ubuntu21 :
 	${MAKE} -f assets/linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
 ubuntu21 : work
 	${MAKE} -f assets/linux.mk distro=ubuntu21 build
+	${MAKE} -f assets/linux.artifacts.mk distro=ubuntu21 artifacts-deb
 ## fedora34
 docker-fedora34 :
 	${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
 fedora34 : work
 	${MAKE} -f assets/linux.mk distro=fedora34 build
+	${MAKE} -f assets/linux.artifacts.mk distro=fedora34 artifacts-rpm
 ## fedora35
 docker-fedora35 :
 	${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
 fedora35 : work
 	${MAKE} -f assets/linux.mk distro=fedora35 build
+	${MAKE} -f assets/linux.artifacts.mk distro=fedora35 artifacts-rpm
 
 
 #
diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile
index f6e2b0b..3ae3618 100644
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@@ -2,7 +2,7 @@ ARG distro
 FROM $distro
 
 ENV version          96.0.3
-ENV source_release   5
+ENV source_release   6
 
 # we use this wasi version
 ENV wasi_fullversion 14.0
@@ -15,7 +15,7 @@ ENV TZ=Europe/Amsterdam
 
 # dependencies needed to run ./mach bootstrap
 RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true)
-RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true)
+RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget rpm-build ; true)
 
 # setup wasi
 RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
@@ -31,8 +31,7 @@ RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.c
     tar xf librewolf-$version-$source_release.source.tar.gz &&\
     cd librewolf-$version-$source_release &&\
     MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
-    . /root/.cargo/env &&\
-    cargo install cbindgen &&\
+    /root/.cargo/bin/cargo install cbindgen &&\
     cd .. &&\
     rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
 
diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk
new file mode 100644
index 0000000..0d416b9
--- /dev/null
+++ b/assets/linux.artifacts.mk
@@ -0,0 +1,18 @@
+# $(distro)
+# $(use_docker)
+
+.PHONY : artifacts-deb artifacts-rpm
+
+version:=$(shell cat version)
+release:=$(shell cat release)
+source_release:=$(shell cat source_release)
+
+use_docker=true
+
+infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
+
+artifacts-deb : $(infile) $(infile).sha256sum
+	sha256sum -c $(infile).sha256sum
+artifacts-rpm : $(infile) $(infile).sha256sum
+	sha256sum -c $(infile).sha256sum
+
diff --git a/assets/linux.mk b/assets/linux.mk
index 9789896..8d3187a 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -15,8 +15,9 @@ outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
 docker :
 	docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
 
-build :
+build : $(outfile) $(outfile).sha256sum
 
+$(outfile) $(outfile).sha256sum :
 	if [ $(use_docker) = true ]; then \
 		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" ; \
 	else \
diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index 893641d..6b1f8ea 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -6,7 +6,7 @@ ARG arch=error
 
 # version of librewolf we use to bootstrap (does not need to be recent)
 ENV version          96.0.3
-ENV source_release   5
+ENV source_release   6
 
 # we use this wasi version
 ENV wasi_fullversion 14.0
diff --git a/source_release b/source_release
index 7ed6ff8..1e8b314 100644
--- a/source_release
+++ b/source_release
@@ -1 +1 @@
-5
+6