diff --git a/README.md b/README.md index c735f08..1faf6f2 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,13 @@ # Update plugins There are plugins that help update librewolf, which helps improve securitiy. -* Guillaume created a windows updater script for the Task Scheduler. it can be found [here](https://github.com/ltGuillaume/LibreWolf-WinUpdater). -* Defkev created a LibreWolf updater plugin, which can be found [here](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/). + + +* Guillaume created a windows *updater script* for the Task Scheduler. it can be found [here](https://github.com/ltGuillaume/LibreWolf-WinUpdater). +* Defkev created a LibreWolf *updater plugin*, which can be found [here](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/). + +Please note the distinction between the *task scheduler updater script* ([LibreWolf-WinUpdater](https://github.com/ltGuillaume/LibreWolf-WinUpdater)) and the *librewolf extension* ([LibreWolf Updater](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/)), in that the latter only checks for updates, but will not install them automatically, while the former does. There's quite a bit of confusion about that on Reddit, GitHub and Gitlab. + # LibreWolf for windows @@ -65,8 +70,8 @@ Once that works, you can check out and compile LibreWolf like this: ``` git clone https://gitlab.com/librewolf-community/browser/windows.git -cd windows -make fetch build artifacts +cd windows/winbuild +make all ``` This will produce the -setup.exe and portable .zip. Have fun! diff --git a/linux-mar/assets/mozconfig b/linux-mar/assets/mozconfig index b9e5a4e..2a4c9c1 100644 --- a/linux-mar/assets/mozconfig +++ b/linux-mar/assets/mozconfig @@ -41,7 +41,7 @@ ac_add_options --enable-release ac_add_options --enable-rust-simd ac_add_options --with-app-name=librewolf -ac_add_options --with-branding=browser/branding/librewolf +ac_add_options --with-branding=browser/branding/nightly ac_add_options --with-unsigned-addon-scopes=app,system @@ -65,8 +65,8 @@ ac_add_options --enable-strip # needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it # https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html - -ac_add_options --disable-verify-mar +# this one below now fails since a few versions. what's up? +#ac_add_options --disable-verify-mar # Internationalization ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n diff --git a/linux/Makefile b/linux/Makefile index e5e44b6..eb98aab 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,4 +1,4 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell version:=$(shell cat version) release:=$(shell cat release) @@ -6,6 +6,8 @@ source_release:=$(shell cat source_release) full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") mozbuild=~/.mozbuild +docker_image_name=lw-win-x64 + help : @echo "use: make [help] [all] [clean] [build] [package] [artifacts]" @@ -23,6 +25,12 @@ help : @echo " bootstrap - try to set up the build environment." @echo " setup-debian, setup-fedora - needed packages." @echo "" + @echo " docker-build - Run 'docker build' for" $(docker_image_name) "image." + @echo " docker-run - Run LW build using 'docker run' on" $(docker_image_name) "image." + @echo " docker-shell - Run shell in" $(docker_image_name) "image, to debug why docker-run fails." + @echo " docker-clean - Remove" $(docker_image_name) "docker image." + @echo " docker-prune - Delete ALL docker data: images, containers, networks, etc." + @echo "" all : build package artifacts @@ -98,3 +106,13 @@ artifacts : firefox-$(full_version).en-US.win64.zip ${MAKE} -f assets/artifacts.mk artifacts +docker-build : + docker build -t $(docker_image_name) - < assets/Dockerfile +docker-run : + docker run --rm $(docker_image_name) sh -c "make fetch && make build" +docker-shell : + docker run -it --rm $(docker_image_name) /bin/bash -i +docker-clean : + docker rmi $(docker_image_name) +docker-prune : + docker system prune --all --force diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile new file mode 100644 index 0000000..4914a24 --- /dev/null +++ b/linux/assets/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:jammy +#FROM fedora:36 + +RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch bash vim mc screen +#RUN dnf -y update && dnf -y install make wget git patch bash vim mc screen + +WORKDIR / +RUN git clone https://gitlab.com/librewolf-community/browser/windows.git +WORKDIR /windows/linux + +RUN make setup-debian && make fetch && make bootstrap && make veryclean +#RUN make setup-fedora && make fetch && make bootstrap && make veryclean diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 4853288..79613d8 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -34,7 +34,7 @@ ac_add_options --disable-debug ac_add_options --disable-default-browser-agent ac_add_options --disable-tests # updater disabled in Settings repo (app.update.auto). -# ac_add_options --disable-updater +ac_add_options --disable-updater ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-release diff --git a/version b/version deleted file mode 100644 index 9f1a9a8..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -105.0.1 diff --git a/Makefile b/winbuild/Makefile similarity index 100% rename from Makefile rename to winbuild/Makefile diff --git a/assets/PrivateBrowsing_150.png b/winbuild/assets/PrivateBrowsing_150.png similarity index 100% rename from assets/PrivateBrowsing_150.png rename to winbuild/assets/PrivateBrowsing_150.png diff --git a/assets/PrivateBrowsing_70.png b/winbuild/assets/PrivateBrowsing_70.png similarity index 100% rename from assets/PrivateBrowsing_70.png rename to winbuild/assets/PrivateBrowsing_70.png diff --git a/assets/aboutDialog/aboutDialog.css b/winbuild/assets/aboutDialog/aboutDialog.css similarity index 100% rename from assets/aboutDialog/aboutDialog.css rename to winbuild/assets/aboutDialog/aboutDialog.css diff --git a/assets/aboutDialog/aboutDialog.js b/winbuild/assets/aboutDialog/aboutDialog.js similarity index 100% rename from assets/aboutDialog/aboutDialog.js rename to winbuild/assets/aboutDialog/aboutDialog.js diff --git a/assets/aboutDialog/aboutDialog.xhtml b/winbuild/assets/aboutDialog/aboutDialog.xhtml similarity index 100% rename from assets/aboutDialog/aboutDialog.xhtml rename to winbuild/assets/aboutDialog/aboutDialog.xhtml diff --git a/assets/banner.bmp b/winbuild/assets/banner.bmp similarity index 100% rename from assets/banner.bmp rename to winbuild/assets/banner.bmp diff --git a/assets/disable-verify-mar.patch b/winbuild/assets/disable-verify-mar.patch similarity index 100% rename from assets/disable-verify-mar.patch rename to winbuild/assets/disable-verify-mar.patch diff --git a/assets/fix-l10n-package-cmd.patch b/winbuild/assets/fix-l10n-package-cmd.patch similarity index 100% rename from assets/fix-l10n-package-cmd.patch rename to winbuild/assets/fix-l10n-package-cmd.patch diff --git a/assets/librewolf-portable/.gitignore b/winbuild/assets/librewolf-portable/.gitignore similarity index 100% rename from assets/librewolf-portable/.gitignore rename to winbuild/assets/librewolf-portable/.gitignore diff --git a/assets/librewolf-portable/README.md b/winbuild/assets/librewolf-portable/README.md similarity index 100% rename from assets/librewolf-portable/README.md rename to winbuild/assets/librewolf-portable/README.md diff --git a/assets/librewolf-portable/Resource.h b/winbuild/assets/librewolf-portable/Resource.h similarity index 100% rename from assets/librewolf-portable/Resource.h rename to winbuild/assets/librewolf-portable/Resource.h diff --git a/assets/librewolf-portable/build.bat b/winbuild/assets/librewolf-portable/build.bat similarity index 100% rename from assets/librewolf-portable/build.bat rename to winbuild/assets/librewolf-portable/build.bat diff --git a/assets/librewolf-portable/librewolf-portable.aps b/winbuild/assets/librewolf-portable/librewolf-portable.aps similarity index 100% rename from assets/librewolf-portable/librewolf-portable.aps rename to winbuild/assets/librewolf-portable/librewolf-portable.aps diff --git a/assets/librewolf-portable/librewolf-portable.cpp b/winbuild/assets/librewolf-portable/librewolf-portable.cpp similarity index 100% rename from assets/librewolf-portable/librewolf-portable.cpp rename to winbuild/assets/librewolf-portable/librewolf-portable.cpp diff --git a/assets/librewolf-portable/librewolf-portable.ico b/winbuild/assets/librewolf-portable/librewolf-portable.ico similarity index 100% rename from assets/librewolf-portable/librewolf-portable.ico rename to winbuild/assets/librewolf-portable/librewolf-portable.ico diff --git a/assets/librewolf-portable/librewolf-portable.rc b/winbuild/assets/librewolf-portable/librewolf-portable.rc similarity index 100% rename from assets/librewolf-portable/librewolf-portable.rc rename to winbuild/assets/librewolf-portable/librewolf-portable.rc diff --git a/assets/librewolf-portable/librewolf-portable.sln b/winbuild/assets/librewolf-portable/librewolf-portable.sln similarity index 100% rename from assets/librewolf-portable/librewolf-portable.sln rename to winbuild/assets/librewolf-portable/librewolf-portable.sln diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj.filters b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj.filters rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj.user b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj.user rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user diff --git a/assets/librewolf-portable/targetver.h b/winbuild/assets/librewolf-portable/targetver.h similarity index 100% rename from assets/librewolf-portable/targetver.h rename to winbuild/assets/librewolf-portable/targetver.h diff --git a/assets/librewolf.ico b/winbuild/assets/librewolf.ico similarity index 100% rename from assets/librewolf.ico rename to winbuild/assets/librewolf.ico diff --git a/assets/mozconfig.windows b/winbuild/assets/mozconfig.windows similarity index 100% rename from assets/mozconfig.windows rename to winbuild/assets/mozconfig.windows diff --git a/assets/mozconfig.windows.debug b/winbuild/assets/mozconfig.windows.debug similarity index 100% rename from assets/mozconfig.windows.debug rename to winbuild/assets/mozconfig.windows.debug diff --git a/assets/mozconfig.windows32 b/winbuild/assets/mozconfig.windows32 similarity index 100% rename from assets/mozconfig.windows32 rename to winbuild/assets/mozconfig.windows32 diff --git a/assets/package-manifest.patch b/winbuild/assets/package-manifest.patch similarity index 100% rename from assets/package-manifest.patch rename to winbuild/assets/package-manifest.patch diff --git a/assets/private_browsing.VisualElementsManifest.xml b/winbuild/assets/private_browsing.VisualElementsManifest.xml similarity index 100% rename from assets/private_browsing.VisualElementsManifest.xml rename to winbuild/assets/private_browsing.VisualElementsManifest.xml diff --git a/assets/setup.nsi b/winbuild/assets/setup.nsi similarity index 100% rename from assets/setup.nsi rename to winbuild/assets/setup.nsi diff --git a/assets/tools.py b/winbuild/assets/tools.py similarity index 100% rename from assets/tools.py rename to winbuild/assets/tools.py diff --git a/assets/tryfix-reslink-fail.patch b/winbuild/assets/tryfix-reslink-fail.patch similarity index 100% rename from assets/tryfix-reslink-fail.patch rename to winbuild/assets/tryfix-reslink-fail.patch diff --git a/assets/update-version.py b/winbuild/assets/update-version.py similarity index 100% rename from assets/update-version.py rename to winbuild/assets/update-version.py diff --git a/mk.py b/winbuild/mk.py similarity index 100% rename from mk.py rename to winbuild/mk.py diff --git a/release b/winbuild/release similarity index 100% rename from release rename to winbuild/release diff --git a/source_release b/winbuild/source_release similarity index 100% rename from source_release rename to winbuild/source_release diff --git a/winbuild/version b/winbuild/version new file mode 100644 index 0000000..6071472 --- /dev/null +++ b/winbuild/version @@ -0,0 +1 @@ +105.0.3