From b019f87eb11e34a7627e0f18ff9ee4714a88fb9b Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 4 Feb 2022 11:20:31 +0100 Subject: [PATCH] bugfixes --- .gitignore | 2 ++ Dockerfile | 12 ++++++++++++ Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ release | 1 + source_release | 1 + version | 1 + 6 files changed, 61 insertions(+) create mode 100644 .gitignore create mode 100644 release create mode 100644 source_release create mode 100644 version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39e8da9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/librewolf-*-*.source.tar.gz +/typescript diff --git a/Dockerfile b/Dockerfile index e69de29..00f7adb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -0,0 +1,12 @@ +ARG distro + +FROM $distro + +# dependencies needed to run ./mach bootstrap + +RUN ( apt -y update && apt -y upgrade && apt -y install mercurial python3 python3-dev python3-pip ; true) +RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel && python3 -m pip install --user mercurial ; true) + +# our work happens here, on the host filesystem. +WORKDIR /work +VOLUME ["/work"] diff --git a/Makefile b/Makefile index e69de29..13e2120 100644 --- a/Makefile +++ b/Makefile @@ -0,0 +1,44 @@ +.PHONY : help all clean veryclean fetch prune + + +version:=$(shell cat version) +release:=$(shell cat release) +source_release:=$(shell cat source_release) + + +help : + @echo "Use: make [help] [all] [clean] [veryclean] [fetch] [prune]" + +all : + ${MAKE} make-docker-image-debian11 + ${MAKE} run-docker-image-debian11 +clean : + sudo rm -rf work + +veryclean : + +prune : + docker system prune --all --force + +# fetching the source +tarball=librewolf-$(version)-$(source_release).source.tar.gz +fetch : $(tarball) +$(tarball) : + wget -O $(tarball) "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/$(tarball)?job=Build" + + + +# debian11 +tag=debian11 +tag_distro=debian:bullseye +make-docker-image-debian11 : + script -e -c 'time docker build --no-cache --build-arg distro=$(tag_distro) -t librewolf/bsys5-image-$(tag) - < Dockerfile' +run-docker-image-debian11 : + sudo rm -rf work + mkdir work + (cd work && tar xf ../$(tarball)) + script -e -c 'time 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"' + + + + diff --git a/release b/release new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/release @@ -0,0 +1 @@ +1 diff --git a/source_release b/source_release new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/source_release @@ -0,0 +1 @@ +3 diff --git a/version b/version new file mode 100644 index 0000000..0c97cb4 --- /dev/null +++ b/version @@ -0,0 +1 @@ +96.0.3