From a5fd770aaee584a61f397b1504cc85d2ce6604dd Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 1 Jun 2022 14:39:46 +0200 Subject: [PATCH] v101.0-1 --- assets/windows.Dockerfile | 90 ++++++++++++++++++++++++++++++--------- version | 2 +- 2 files changed, 72 insertions(+), 20 deletions(-) diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile index 30f7980..8fa30ae 100644 --- a/assets/windows.Dockerfile +++ b/assets/windows.Dockerfile @@ -1,16 +1,70 @@ FROM debian:bullseye - ARG version=error ARG source_release=error -# we use this wasi version -ENV wasi_fullversion 14.0 -ENV wasi_mainversion 14 - # 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 wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync +# setup windows tools +RUN true + + + + + + + +# +# run the bootstrap +# + +RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build +RUN tar xf librewolf-$version-$source_release.source.tar.gz +WORKDIR librewolf-$version-$source_release + +#RUN wget -q -O firefox-$version.source.tar.gz "https://archive.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz" +#RUN tar xf firefox-$version.source.tar.gz +#WORKDIR firefox-$version + +#RUN mkdir -p work +#WORKDIR work +#RUN wget -O bootstrap.py https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py +#RUN python3 bootstrap.py --no-interactive --application-choice=browser +#WORKDIR mozilla-unified + + + +# mozconfig file +#RUN echo "" > mozconfig +#RUN echo "ac_add_options --target=x86_64-pc-mingw32" >> mozconfig +#RUN echo "ac_add_options --enable-bootstrap" >> mozconfig +#RUN echo "ac_add_options --disable-profiling" >> mozconfig +#RUN echo "" >> mozconfig + + +# throw in a patch to see if that fixes the zstandard issue. +#RUN wget https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/revert-crossbeam-crates-upgrade.patch +#RUN patch -p1 -i revert-crossbeam-crates-upgrade.patch + + +RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser +#RUN ./mach --no-interactive bootstrap --application-choice=browser + + + +RUN /root/.cargo/bin/cargo install cbindgen +RUN /root/.cargo/bin/rustup target add x86_64-pc-mingw32 +# not sure about this one.. +RUN pip install testresources pycairo + + + + + + # setup wasi +ENV wasi_fullversion 14.0 +ENV wasi_mainversion 14 RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$wasi_mainversion/wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ tar xf wasi-sdk-$wasi_fullversion-linux.tar.gz &&\ @@ -19,23 +73,21 @@ RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ cp -r wasi-sdk-$wasi_fullversion/share/wasi-sysroot $target_wasi_location &&\ rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* -# setup windows tools -RUN true -# run the bootstrap -RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build -RUN tar xf librewolf-$version-$source_release.source.tar.gz -WORKDIR librewolf-$version-$source_release -RUN echo "ac_add_options --target=x86_64-pc-mingw32" > mozconfig -RUN echo "ac_add_options --enable-bootstrap" > mozconfig -RUN echo "" > mozconfig -RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser -RUN /root/.cargo/bin/cargo install cbindgen -RUN /root/.cargo/bin/rustup target add x86_64-pc-mingw32 -# not sure about this one.. -RUN pip install testresources pycairo + + + + + + # our work happens here, on the host filesystem. WORKDIR /work VOLUME ["/work"] + + + + + + diff --git a/version b/version index 5b3cfb1..f60fc8f 100644 --- a/version +++ b/version @@ -1 +1 @@ -98.0.2 \ No newline at end of file +101.0