From 5d7a02f997ad9b51b67810266fdadaaebf9f0651 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 30 Sep 2021 18:35:45 +0200 Subject: [PATCH] added targets mint and ubuntu --- build.py | 4 +-- docker/Makefile | 20 +++++++++++-- docker/librewolf/Makefile | 29 +++++++++++++++++-- docker/librewolf/arch/Makefile | 5 ++++ docker/librewolf/arch/todo | 0 docker/librewolf/debian/Dockerfile | 6 ++-- docker/librewolf/debian/Makefile | 6 ++++ docker/librewolf/debian/deb/Dockerfile | 4 +++ docker/librewolf/debian/deb/Makefile | 8 +++++ docker/librewolf/fedora/Dockerfile | 21 ++++++++++++-- docker/librewolf/fedora/Makefile | 6 ++++ docker/librewolf/fedora/rpm/Dockerfile | 2 ++ docker/librewolf/fedora/rpm/Makefile | 8 +++++ docker/librewolf/macos/Makefile | 5 ++++ docker/librewolf/macos/todo | 0 docker/librewolf/mint/Dockerfile | 20 +++++++++++-- docker/librewolf/mint/Makefile | 6 ++++ docker/librewolf/mint/deb/Dockerfile | 2 ++ docker/librewolf/mint/deb/Makefile | 8 +++++ docker/librewolf/pe/appimage/todo | 0 docker/librewolf/pe/flatpak/todo | 0 docker/librewolf/pe/snapd/todo | 0 docker/librewolf/portable-linux/Makefile | 20 +++++++++++++ .../portable-linux/appimage/Makefile | 5 ++++ .../librewolf/portable-linux/flatpak/Makefile | 5 ++++ .../librewolf/portable-linux/snapd/Makefile | 5 ++++ docker/librewolf/ubuntu/Dockerfile | 20 +++++++++++-- docker/librewolf/ubuntu/Makefile | 6 ++++ docker/librewolf/ubuntu/deb/Dockerfile | 2 ++ docker/librewolf/ubuntu/deb/Makefile | 8 +++++ docker/librewolf/windows/Makefile | 5 ++++ docker/librewolf/windows/todo | 0 32 files changed, 220 insertions(+), 16 deletions(-) create mode 100644 docker/librewolf/arch/Makefile delete mode 100644 docker/librewolf/arch/todo create mode 100644 docker/librewolf/debian/deb/Dockerfile create mode 100644 docker/librewolf/debian/deb/Makefile create mode 100644 docker/librewolf/fedora/rpm/Dockerfile create mode 100644 docker/librewolf/fedora/rpm/Makefile create mode 100644 docker/librewolf/macos/Makefile delete mode 100644 docker/librewolf/macos/todo create mode 100644 docker/librewolf/mint/deb/Dockerfile create mode 100644 docker/librewolf/mint/deb/Makefile delete mode 100644 docker/librewolf/pe/appimage/todo delete mode 100644 docker/librewolf/pe/flatpak/todo delete mode 100644 docker/librewolf/pe/snapd/todo create mode 100644 docker/librewolf/portable-linux/Makefile create mode 100644 docker/librewolf/portable-linux/appimage/Makefile create mode 100644 docker/librewolf/portable-linux/flatpak/Makefile create mode 100644 docker/librewolf/portable-linux/snapd/Makefile create mode 100644 docker/librewolf/ubuntu/deb/Dockerfile create mode 100644 docker/librewolf/ubuntu/deb/Makefile create mode 100644 docker/librewolf/windows/Makefile delete mode 100644 docker/librewolf/windows/todo diff --git a/build.py b/build.py index a4f31b6..8109f7f 100755 --- a/build.py +++ b/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") diff --git a/docker/Makefile b/docker/Makefile index c70c3a9..e6841cc 100644 --- a/docker/Makefile +++ b/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 diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index b73e537..b1969e5 100644 --- a/docker/librewolf/Makefile +++ b/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 diff --git a/docker/librewolf/arch/Makefile b/docker/librewolf/arch/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/arch/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/arch/todo b/docker/librewolf/arch/todo deleted file mode 100644 index e69de29..0000000 diff --git a/docker/librewolf/debian/Dockerfile b/docker/librewolf/debian/Dockerfile index e5f8cbc..8a3251d 100644 --- a/docker/librewolf/debian/Dockerfile +++ b/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 diff --git a/docker/librewolf/debian/Makefile b/docker/librewolf/debian/Makefile index 58802ad..333ca8a 100644 --- a/docker/librewolf/debian/Makefile +++ b/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 + diff --git a/docker/librewolf/debian/deb/Dockerfile b/docker/librewolf/debian/deb/Dockerfile new file mode 100644 index 0000000..3470001 --- /dev/null +++ b/docker/librewolf/debian/deb/Dockerfile @@ -0,0 +1,4 @@ +from librewolf/release-debian +workdir /windows + +run ./build.py --version $(cat /version) lw_artifacts diff --git a/docker/librewolf/debian/deb/Makefile b/docker/librewolf/debian/deb/Makefile new file mode 100644 index 0000000..ed2509c --- /dev/null +++ b/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) . + diff --git a/docker/librewolf/fedora/Dockerfile b/docker/librewolf/fedora/Dockerfile index 7f2274f..c842172 100644 --- a/docker/librewolf/fedora/Dockerfile +++ b/docker/librewolf/fedora/Dockerfile @@ -1,2 +1,19 @@ -from librewolf/built-image -run python3 build.py lw_artifacts +from mozilla/buildenv-fedora +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 + diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile index f288ec0..bbe3457 100644 --- a/docker/librewolf/fedora/Makefile +++ b/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 + diff --git a/docker/librewolf/fedora/rpm/Dockerfile b/docker/librewolf/fedora/rpm/Dockerfile new file mode 100644 index 0000000..2ccc503 --- /dev/null +++ b/docker/librewolf/fedora/rpm/Dockerfile @@ -0,0 +1,2 @@ +from librewolf/release-fedora +run ./build.py --version $(cat /version) lw_artifacts diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora/rpm/Makefile new file mode 100644 index 0000000..6995276 --- /dev/null +++ b/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) . + diff --git a/docker/librewolf/macos/Makefile b/docker/librewolf/macos/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/macos/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/macos/todo b/docker/librewolf/macos/todo deleted file mode 100644 index e69de29..0000000 diff --git a/docker/librewolf/mint/Dockerfile b/docker/librewolf/mint/Dockerfile index 7f2274f..68bd223 100644 --- a/docker/librewolf/mint/Dockerfile +++ b/docker/librewolf/mint/Dockerfile @@ -1,2 +1,18 @@ -from librewolf/built-image -run python3 build.py lw_artifacts +from mozilla/buildenv-mint +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 diff --git a/docker/librewolf/mint/Makefile b/docker/librewolf/mint/Makefile index d7a853f..05c4a69 100644 --- a/docker/librewolf/mint/Makefile +++ b/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 + diff --git a/docker/librewolf/mint/deb/Dockerfile b/docker/librewolf/mint/deb/Dockerfile new file mode 100644 index 0000000..59b85de --- /dev/null +++ b/docker/librewolf/mint/deb/Dockerfile @@ -0,0 +1,2 @@ +from librewolf/release-mint +run ./build.py --version $(cat /version) lw_artifacts diff --git a/docker/librewolf/mint/deb/Makefile b/docker/librewolf/mint/deb/Makefile new file mode 100644 index 0000000..6b9b73e --- /dev/null +++ b/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) . + diff --git a/docker/librewolf/pe/appimage/todo b/docker/librewolf/pe/appimage/todo deleted file mode 100644 index e69de29..0000000 diff --git a/docker/librewolf/pe/flatpak/todo b/docker/librewolf/pe/flatpak/todo deleted file mode 100644 index e69de29..0000000 diff --git a/docker/librewolf/pe/snapd/todo b/docker/librewolf/pe/snapd/todo deleted file mode 100644 index e69de29..0000000 diff --git a/docker/librewolf/portable-linux/Makefile b/docker/librewolf/portable-linux/Makefile new file mode 100644 index 0000000..ca110a1 --- /dev/null +++ b/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 diff --git a/docker/librewolf/portable-linux/appimage/Makefile b/docker/librewolf/portable-linux/appimage/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/portable-linux/appimage/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/portable-linux/flatpak/Makefile b/docker/librewolf/portable-linux/flatpak/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/portable-linux/flatpak/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/portable-linux/snapd/Makefile b/docker/librewolf/portable-linux/snapd/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/portable-linux/snapd/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/ubuntu/Dockerfile b/docker/librewolf/ubuntu/Dockerfile index 7f2274f..58ebf3c 100644 --- a/docker/librewolf/ubuntu/Dockerfile +++ b/docker/librewolf/ubuntu/Dockerfile @@ -1,2 +1,18 @@ -from librewolf/built-image -run python3 build.py lw_artifacts +from mozilla/buildenv-ubuntu +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 diff --git a/docker/librewolf/ubuntu/Makefile b/docker/librewolf/ubuntu/Makefile index 03cf88a..07877ab 100644 --- a/docker/librewolf/ubuntu/Makefile +++ b/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 + diff --git a/docker/librewolf/ubuntu/deb/Dockerfile b/docker/librewolf/ubuntu/deb/Dockerfile new file mode 100644 index 0000000..495a097 --- /dev/null +++ b/docker/librewolf/ubuntu/deb/Dockerfile @@ -0,0 +1,2 @@ +from librewolf/release-ubuntu +run ./build.py --version $(cat /version) lw_artifacts diff --git a/docker/librewolf/ubuntu/deb/Makefile b/docker/librewolf/ubuntu/deb/Makefile new file mode 100644 index 0000000..6b9b73e --- /dev/null +++ b/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) . + diff --git a/docker/librewolf/windows/Makefile b/docker/librewolf/windows/Makefile new file mode 100644 index 0000000..b249ac0 --- /dev/null +++ b/docker/librewolf/windows/Makefile @@ -0,0 +1,5 @@ +all : + @echo Todo... + +no-cache : + @echo Todo... diff --git a/docker/librewolf/windows/todo b/docker/librewolf/windows/todo deleted file mode 100644 index e69de29..0000000