From 20c82e2cd1823fffacad2e480f8fc94d00e77725 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Fri, 4 Feb 2022 12:28:20 +0100
Subject: [PATCH] changes

---
 Dockerfile |  2 +-
 Makefile   | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b98839..49a34e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG distro
 FROM $distro
 
 # 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 ; true)
+RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip libclang-dev ; true)
 RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel ; true)
 
 # our work happens here, on the host filesystem.
diff --git a/Makefile b/Makefile
index a88dc59..4e3ee33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help all clean veryclean fetch prune
+.PHONY : help all clean veryclean fetch prune docker build debian11 fedora35
 
 
 version:=$(shell cat version)
@@ -8,11 +8,14 @@ source_release:=$(shell cat source_release)
 tarball=librewolf-$(version)-$(source_release).source.tar.gz
 
 help :
-	@echo "Use: make [help] [all] [clean] [veryclean] [fetch] [prune]"
+	@echo "Use: make [help] [all] [docker] [build] [clean] [veryclean] [fetch] [prune]"
+	@echo ""
+	@echo "Os targets:" 
+	@echo "  [debian11]  - docker+build for debian11"
+	@echo "  [fedora35]  - docker+build for fedora35"
 
 all :
-	${MAKE} make-docker-image-debian11
-	${MAKE} run-docker-image-debian11
+	@echo "Nothing happens."
 clean :
 	sudo rm -rf work
 
@@ -27,17 +30,35 @@ $(tarball) :
 	wget -O $(tarball) "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/$(tarball)?job=Build"
 
 
+docker : make-docker-image-debian11 make-docker-image-fedora35 
+build : run-docker-image-debian11 run-docker-image-fedora35
+
+## debian11
+debian11 : make-docker-image-debian11 run-docker-image-debian11
 
-# debian11
-tag=debian11
-tag_distro=debian:bullseye
 make-docker-image-debian11 :
-	docker build --no-cache --build-arg distro=$(tag_distro) -t librewolf/bsys5-image-$(tag) - < Dockerfile
+	docker build --build-arg "distro=debian:bullseye" -t librewolf/bsys5-image-debian11 - < Dockerfile
 run-docker-image-debian11 :
 	sudo rm -rf work
 	mkdir work
 	(cd work && tar xf ../$(tarball))
-	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-$(tag) sh -c "cd /work/librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && ./mach build && ./mach package"
+	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-debian11 sh -c "cd /work/librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && ./mach build && ./mach package"
+
+
+
+
+
+
+## fedora35
+fedora35 : make-docker-image-fedora35 run-docker-image-fedora35
+
+make-docker-image-fedora35 :
+	docker build --build-arg "distro=fedora:35" -t librewolf/bsys5-image-fedora35 - < Dockerfile
+run-docker-image-fedora35 :
+	sudo rm -rf work
+	mkdir work
+	(cd work && tar xf ../$(tarball))
+	docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-fedora35 sh -c "cd /work/librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && ./mach build && ./mach package"