Sun 09 Oct 2022 12:48:05 PM CEST

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!

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

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

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

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

version

@@ -1 +0,0 @@
-105.0.1

winbuild/version

@@ -0,0 +1 @@
+105.0.3