added targets mint and ubuntu

build.py

@@ -43,8 +43,6 @@ if options.distro == 'autodetect':
 
 
 if options.version != None:
-    print('[debug] options.version = ')
-    print(options.version)
     if options.src != 'release':
         print('error: cant use --version and --src at the same time')
         sys.exit(1)
@@ -267,6 +265,8 @@ def execute_lw_do_patches():
 
         
         # copy branding files..
+
+        exec('echo +++ && pwd && ls ../common')
         exec("cp -vr ../common/source_files/browser .")
         exec("cp -v ../files/configure.sh browser/branding/librewolf")
 

docker/Makefile

@@ -1,3 +1,7 @@
+help :
+	@echo "Use: make all clean lw prune mozilla full"
+	@echo "     make debian fedora mint ubuntu"
+
 all : lw
 # for working with the original mozilla source:
 # all : mozilla
@@ -26,6 +30,18 @@ prune :
 
 full : prune lw mozilla
 
-help :
+
-	@echo "Use: make all help clean lw prune mozilla full"
+
+debian :
+	make -C buildenv/debian
+	make -C librewolf/debian
+fedora :
+	mace -C buildenv/fedora
+	make -C librewolf/fedora
+mint :
+	mace -C buildenv/mint
+	make -C librewolf/mint
+ubuntu :
+	mace -C buildenv/ubuntu
+	make -C librewolf/ubuntu
 

docker/librewolf/Makefile

@@ -1,6 +1,13 @@
+.phony : all clean
+
 all :
 
-	cp version debian/version && cp version fedora/version && cp version ubuntu/version && cp version mint/version
+	cp version debian/version && cp version fedora/version && cp version ubuntu/version && cp version mint/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
+
+	make -C arch
+	make -C macos
+	make -C windows
+	make -C portable-linux
 
 	make -C debian
 	make -C fedora
@@ -9,4 +16,22 @@ all :
 
 
 clean :
-	rm -f version debian/version fedora/version ubuntu/version mint/version
+	rm -f version debian/version fedora/version ubuntu/version mint/version arch/version macos/version windows/version portable-linux/version
+	make -C portable-linux clean
+
+build.debian :
+	make -C debian
+build.fedora :
+	make -C fedora
+build.mint :
+	make -C mint
+build.ubuntu :
+	make -C ubuntu
+
+
+build.arch :
+	make -C arch
+build.macos :
+	make -C macos
+build.windows :
+	make -C windows

docker/librewolf/arch/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...

docker/librewolf/debian/Dockerfile

@@ -4,17 +4,15 @@ run rm -rf mozilla-unified
 # Build it..
 copy version /
 run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
-run tar xf firefox-$(cat /version).source.tar.xz
 
 # dependencies, tools, distro build tools,...
 run apt-get install -y git
-run ### [build trigger] (add or remove a few hashes in front to build from here)
+run ## [build trigger] (add or remove a few hashes in front to trigger build from here)
 run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
 workdir windows
-run ln -s /firefox-$(cat /version)
+run tar xf /firefox-$(cat /version).source.tar.xz
 
 run ./build.py --version $(cat /version) lw_do_patches
 run ./build.py --version $(cat /version) build
 run ./build.py --version $(cat /version) lw_post_build
 run ./build.py --version $(cat /version) package
-run ./build.py --version $(cat /version) lw_artifacts

docker/librewolf/debian/Makefile

@@ -1,2 +1,8 @@
 all :
 	sudo docker build -t librewolf/release-debian .
+	make -C deb all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-debian .
+	make -C deb no-cache
+

docker/librewolf/debian/deb/Dockerfile

@@ -0,0 +1,4 @@
+from librewolf/release-debian
+workdir /windows
+
+run ./build.py --version $(cat /version) lw_artifacts

docker/librewolf/debian/deb/Makefile

@@ -0,0 +1,8 @@
+docker_stage = deb-debian
+
+all :
+	sudo docker build -t librewolf/$(docker_stage) .
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/$(docker_stage) .
+

docker/librewolf/fedora/Dockerfile

@@ -1,2 +1,19 @@
-from librewolf/built-image
+from mozilla/buildenv-fedora
-run python3 build.py lw_artifacts
+run rm -rf mozilla-unified
+
+# Build it..
+copy version /
+run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
+
+# dependencies, tools, distro build tools,...
+run dnf -y install git
+run ### [build trigger] (add or remove a few hashes in front to trigger build from here)
+run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
+workdir windows
+run tar xf /firefox-$(cat /version).source.tar.xz
+
+run ./build.py --version $(cat /version) lw_do_patches
+run ./build.py --version $(cat /version) build
+run ./build.py --version $(cat /version) lw_post_build
+run ./build.py --version $(cat /version) package
+

docker/librewolf/fedora/Makefile

@@ -1,2 +1,8 @@
 all :
 	sudo docker build -t librewolf/release-fedora .
+	make -C rpm all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-fedora .
+	make -C rpm no-cache
+

docker/librewolf/fedora/rpm/Dockerfile

@@ -0,0 +1,2 @@
+from librewolf/release-fedora
+run ./build.py --version $(cat /version) lw_artifacts

docker/librewolf/fedora/rpm/Makefile

@@ -0,0 +1,8 @@
+docker_stage = rpm-fedora
+
+all :
+	sudo docker build -t librewolf/$(docker_stage) .
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/$(docker_stage) .
+

docker/librewolf/macos/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...

docker/librewolf/mint/Dockerfile

@@ -1,2 +1,18 @@
-from librewolf/built-image
+from mozilla/buildenv-mint
-run python3 build.py lw_artifacts
+run rm -rf mozilla-unified
+
+# Build it..
+copy version /
+run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
+
+# dependencies, tools, distro build tools,...
+run apt-get install -y git
+run ## [build trigger] (add or remove a few hashes in front to trigger build from here)
+run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
+workdir windows
+run tar xf /firefox-$(cat /version).source.tar.xz
+
+run ./build.py --version $(cat /version) lw_do_patches
+run ./build.py --version $(cat /version) build
+run ./build.py --version $(cat /version) lw_post_build
+run ./build.py --version $(cat /version) package

docker/librewolf/mint/Makefile

@@ -1,2 +1,8 @@
 all :
 	sudo docker build -t librewolf/release-mint .
+	make -C deb all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-mint .
+	make -C deb no-cache
+

docker/librewolf/mint/deb/Dockerfile

@@ -0,0 +1,2 @@
+from librewolf/release-mint
+run ./build.py --version $(cat /version) lw_artifacts

docker/librewolf/mint/deb/Makefile

@@ -0,0 +1,8 @@
+docker_stage = deb-mint
+
+all :
+	sudo docker build -t librewolf/$(docker_stage) .
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/$(docker_stage) .
+

docker/librewolf/portable-linux/Makefile

@@ -0,0 +1,20 @@
+.phony : all clean debian fedora mint ubuntu arch macos windows
+
+all :
+
+	cp version appimage/version && cp version flatpak/version && cp version snapd/version
+
+	make -C appimage
+	make -C flatpak
+	make -C snapd
+
+clean :
+	rm -f version appimage/version flatpak/version snapd/version
+
+
+build.appimage :
+	make -C appimage
+build.flatpak :
+	make -C flatpak
+build.snapd :
+	make -C snapd

docker/librewolf/portable-linux/appimage/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...

docker/librewolf/portable-linux/flatpak/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...

docker/librewolf/portable-linux/snapd/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...

docker/librewolf/ubuntu/Dockerfile

@@ -1,2 +1,18 @@
-from librewolf/built-image
+from mozilla/buildenv-ubuntu
-run python3 build.py lw_artifacts
+run rm -rf mozilla-unified
+
+# Build it..
+copy version /
+run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
+
+# dependencies, tools, distro build tools,...
+run apt-get install -y git
+run ## [build trigger] (add or remove a few hashes in front to trigger build from here)
+run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
+workdir windows
+run tar xf /firefox-$(cat /version).source.tar.xz
+
+run ./build.py --version $(cat /version) lw_do_patches
+run ./build.py --version $(cat /version) build
+run ./build.py --version $(cat /version) lw_post_build
+run ./build.py --version $(cat /version) package

docker/librewolf/ubuntu/Makefile

@@ -1,2 +1,8 @@
 all :
 	sudo docker build -t librewolf/release-ubuntu .
+	make -C deb all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-ubuntu .
+	make -C deb no-cache
+

docker/librewolf/ubuntu/deb/Dockerfile

@@ -0,0 +1,2 @@
+from librewolf/release-ubuntu
+run ./build.py --version $(cat /version) lw_artifacts

docker/librewolf/ubuntu/deb/Makefile

@@ -0,0 +1,8 @@
+docker_stage = deb-mint
+
+all :
+	sudo docker build -t librewolf/$(docker_stage) .
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/$(docker_stage) .
+

docker/librewolf/windows/Makefile

@@ -0,0 +1,5 @@
+all :
+	@echo Todo...
+
+no-cache :
+	@echo Todo...