diff --git a/assets/windows.Dockerfile b/assets/windows.Dockerfile index 5f902f5..28b5701 100644 --- a/assets/windows.Dockerfile +++ b/assets/windows.Dockerfile @@ -26,7 +26,8 @@ RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\ rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* # install-packages -RUN apt -y install msitools p7zip-full nsis upx-ucl wine wine64-tools libssl-dev zstd +# for wine, use: apt install wine wine64-tools +RUN apt -y install msitools p7zip-full upx-ucl libssl-dev zstd # prepare 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 @@ -34,7 +35,7 @@ RUN tar xf librewolf-$version-$source_release.source.tar.gz WORKDIR librewolf-$version-$source_release RUN echo "export MOZBUILD=$HOME/.mozbuild" > mozconfig -RUN echo "ac_add_options --enable-bootstrap" >> mozconfig +#RUN echo "ac_add_options --enable-bootstrap" >> mozconfig RUN echo "" >> mozconfig RUN echo "ac_add_options --target=x86_64-pc-mingw32" >> mozconfig RUN echo "CROSS_BUILD=1" >> mozconfig @@ -66,21 +67,45 @@ RUN ./mach artifact toolchain --from-build linux64-cbindgen RUN ./mach artifact toolchain --from-build linux64-wine RUN ./mach artifact toolchain --from-build linux64-liblowercase +### + +RUN ./mach artifact toolchain --from-build sysroot-x86_64-linux-gnu +RUN ./mach artifact toolchain --from-build linux64-dump_syms +RUN ./mach artifact toolchain --from-build linux64-winchecksec +RUN ./mach artifact toolchain --from-build nsis + + RUN (cd build/liblowercase && cargo build && mkdir -p ~/.mozbuild/win-cross/liblowercase && cp -v target/debug/liblowercase.so ~/.mozbuild/win-cross/liblowercase) RUN ./mach python --virtualenv build build/vs/pack_vs.py build/vs/vs2019.yaml -o ${HOME}/.mozbuild/vs.tar.zst RUN (cd ${HOME}/.mozbuild/win-cross && tar xf ../vs.tar.zst) RUN rm -rf ${HOME}/.mozbuild/vs.tar.zst + + + + +### extract wine manually +WORKDIR /root/.mozbuild/toolchains +RUN zstd -d 2f336143042ff638-wine.tar.zst +WORKDIR /root/.mozbuild +RUN tar xf toolchains/2f336143042ff638-wine.tar + + +# wasi in /usr/lib64 check.. +WORKDIR /librewolf-$version-$source_release +RUN pwd +RUN ls +RUN ./mach build + # cleanup big mozilla build folder. -WORKDIR .. -RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz +RUN rm -rf /librewolf-$version-$source_release /librewolf-$version-$source_release.source.tar.gz # expose the /work folder WORKDIR /work VOLUME ["/work"] - +# done, only commented documentation below @@ -208,3 +233,4 @@ VOLUME ["/work"] + diff --git a/assets/windows.mozconfig b/assets/windows.mozconfig index 5bf17f8..3b53a48 100644 --- a/assets/windows.mozconfig +++ b/assets/windows.mozconfig @@ -4,7 +4,7 @@ export MOZBUILD=$HOME/.mozbuild #ac_add_options --with-wasi-sysroot=$MOZBUILD/wrlb ac_add_options --without-wasm-sandboxed-libraries -ac_add_options --enable-bootstrap +#ac_add_options --enable-bootstrap #