From 2424b0c7f2770b2a207ae2c2444f4a42db355bf5 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 29 Sep 2021 22:49:02 +0200 Subject: [PATCH] fixes --- Makefile | 4 ++++ build.py | 9 ++++++++- docker/Makefile | 17 +++++++++++++---- docker/built-image/Dockerfile | 16 ++++++++++++++++ docker/built-image/Makefile | 2 ++ docker/fetched-image/Dockerfile | 9 +++++++++ docker/fetched-image/Makefile | 2 ++ docker/librewolf/debian/Dockerfile | 16 ++-------------- docker/librewolf/debian/Makefile | 2 +- docker/librewolf/fedora/Dockerfile | 16 ++-------------- docker/librewolf/fedora/Makefile | 2 +- docker/librewolf/mint/Dockerfile | 16 ++-------------- docker/librewolf/mint/Makefile | 2 +- docker/librewolf/ubuntu/Dockerfile | 16 ++-------------- docker/librewolf/ubuntu/Makefile | 2 +- docker/release/debian/Dockerfile | 12 +----------- 16 files changed, 67 insertions(+), 76 deletions(-) create mode 100644 docker/built-image/Dockerfile create mode 100644 docker/built-image/Makefile create mode 100644 docker/fetched-image/Dockerfile create mode 100644 docker/fetched-image/Makefile diff --git a/Makefile b/Makefile index 53a43ef..1b65761 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,12 @@ BUILD=python3 build.py ${OPTS} + all : $(BUILD) all clean : $(BUILD) clean + veryclean : $(BUILD) veryclean @@ -33,6 +35,8 @@ git_init : reset : $(BUILD) reset + + # Building docker files.. .phony : docker-all docker-clean docker-all : diff --git a/build.py b/build.py index 4125bcc..4480721 100755 --- a/build.py +++ b/build.py @@ -26,6 +26,7 @@ parser.add_option('-t', '--distro', dest='distro', default='aut parser.add_option('-T', '--token', dest='token', default='') parser.add_option('-3', '--i386', dest='i386', default=False, action="store_true") parser.add_option('-P', '--no-settings-pane', dest='settings_pane', default=True, action="store_false") +parser.add_option('-v', '--version', dest='version', action="store", type="string") options, remainder = parser.parse_args() @@ -41,8 +42,14 @@ 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) - + pkgver=options.version diff --git a/docker/Makefile b/docker/Makefile index 40aee62..4a02031 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,15 +1,24 @@ all : - cp version release && cp version librewolf + cp version release && cp version librewolf && cp version fetched-image make -C buildenv - make -C nightly - make -C release + make -C fetched-image + make -C built-image make -C librewolf clean : - rm -f librewolf/version release/version + rm -f librewolf/version release/version fetched-image/version + make -C librewolf clean make -C release clean prune : sudo docker system prune --all --force + +mozilla : + cp version release && cp version librewolf && cp version fetched-image + + make -C buildenv + make -C fetched-image + make -C nightly + make -C release diff --git a/docker/built-image/Dockerfile b/docker/built-image/Dockerfile new file mode 100644 index 0000000..0f1b113 --- /dev/null +++ b/docker/built-image/Dockerfile @@ -0,0 +1,16 @@ +from librewolf/fetched-image +# dependencies +run apt-get install -y git + +workdir / +run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git +workdir windows +run ln -s /firefox-$(cat /version) +run ls -l +run pwd +run ls -l / +run python3 build.py --version $(cat /version) fetch +run python3 build.py lw_do_patches +run python3 build.py build +run python3 build.py lw_post_build +run python3 build.py package diff --git a/docker/built-image/Makefile b/docker/built-image/Makefile new file mode 100644 index 0000000..94ede27 --- /dev/null +++ b/docker/built-image/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t librewolf/built-image . diff --git a/docker/fetched-image/Dockerfile b/docker/fetched-image/Dockerfile new file mode 100644 index 0000000..39dc847 --- /dev/null +++ b/docker/fetched-image/Dockerfile @@ -0,0 +1,9 @@ +from mozilla/buildenv-debian +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 +run ln -s firefox-$(cat /version) work +workdir work diff --git a/docker/fetched-image/Makefile b/docker/fetched-image/Makefile new file mode 100644 index 0000000..2bb26c3 --- /dev/null +++ b/docker/fetched-image/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t librewolf/fetched-image . diff --git a/docker/librewolf/debian/Dockerfile b/docker/librewolf/debian/Dockerfile index 16d8973..7f2274f 100644 --- a/docker/librewolf/debian/Dockerfile +++ b/docker/librewolf/debian/Dockerfile @@ -1,14 +1,2 @@ -FROM mozilla/buildenv-debian -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 -run ln -s firefox-$(cat /version) work - -workdir work - -run ./mach build -run ./mach package +from librewolf/built-image +run python3 build.py lw_artifacts diff --git a/docker/librewolf/debian/Makefile b/docker/librewolf/debian/Makefile index 5798103..58802ad 100644 --- a/docker/librewolf/debian/Makefile +++ b/docker/librewolf/debian/Makefile @@ -1,2 +1,2 @@ all : - sudo docker build -t mozilla/release-debian . + sudo docker build -t librewolf/release-debian . diff --git a/docker/librewolf/fedora/Dockerfile b/docker/librewolf/fedora/Dockerfile index 6da1815..7f2274f 100644 --- a/docker/librewolf/fedora/Dockerfile +++ b/docker/librewolf/fedora/Dockerfile @@ -1,14 +1,2 @@ -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 -run tar xf firefox-$(cat /version).source.tar.xz -run ln -s firefox-$(cat /version) work - -workdir work - -run ./mach build -run ./mach package +from librewolf/built-image +run python3 build.py lw_artifacts diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile index 980a49a..f288ec0 100644 --- a/docker/librewolf/fedora/Makefile +++ b/docker/librewolf/fedora/Makefile @@ -1,2 +1,2 @@ all : - sudo docker build -t mozilla/release-fedora . + sudo docker build -t librewolf/release-fedora . diff --git a/docker/librewolf/mint/Dockerfile b/docker/librewolf/mint/Dockerfile index 8061c86..7f2274f 100644 --- a/docker/librewolf/mint/Dockerfile +++ b/docker/librewolf/mint/Dockerfile @@ -1,14 +1,2 @@ -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 -run tar xf firefox-$(cat /version).source.tar.xz -run ln -s firefox-$(cat /version) work - -workdir work - -run ./mach build -run ./mach package +from librewolf/built-image +run python3 build.py lw_artifacts diff --git a/docker/librewolf/mint/Makefile b/docker/librewolf/mint/Makefile index 6ddcc0e..d7a853f 100644 --- a/docker/librewolf/mint/Makefile +++ b/docker/librewolf/mint/Makefile @@ -1,2 +1,2 @@ all : - sudo docker build -t mozilla/release-mint . + sudo docker build -t librewolf/release-mint . diff --git a/docker/librewolf/ubuntu/Dockerfile b/docker/librewolf/ubuntu/Dockerfile index ec9f895..7f2274f 100644 --- a/docker/librewolf/ubuntu/Dockerfile +++ b/docker/librewolf/ubuntu/Dockerfile @@ -1,14 +1,2 @@ -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 -run tar xf firefox-$(cat /version).source.tar.xz -run ln -s firefox-$(cat /version) work - -workdir work - -run ./mach build -run ./mach package +from librewolf/built-image +run python3 build.py lw_artifacts diff --git a/docker/librewolf/ubuntu/Makefile b/docker/librewolf/ubuntu/Makefile index 9111716..03cf88a 100644 --- a/docker/librewolf/ubuntu/Makefile +++ b/docker/librewolf/ubuntu/Makefile @@ -1,2 +1,2 @@ all : - sudo docker build -t mozilla/release-ubuntu . + sudo docker build -t librewolf/release-ubuntu . diff --git a/docker/release/debian/Dockerfile b/docker/release/debian/Dockerfile index 16d8973..d82180f 100644 --- a/docker/release/debian/Dockerfile +++ b/docker/release/debian/Dockerfile @@ -1,14 +1,4 @@ -FROM mozilla/buildenv-debian -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 -run ln -s firefox-$(cat /version) work - -workdir work +from librewolf/fetched-image run ./mach build run ./mach package