From 4f92e73ec45c295ecabf3f64dea3f99475258bd9 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 3 Feb 2021 23:53:06 +0100
Subject: [PATCH 01/29] changes

---
 README2.md                                    |  53 +++++
 build.sh                                      | 190 ++++++++++++++++++
 .../stubinstaller/bgstub.jpg                  | Bin 0 -> 1228 bytes
 .../stubinstaller/installing_page.css         |  61 ++++++
 .../stubinstaller/profile_cleanup_page.css    |  42 ++++
 5 files changed, 346 insertions(+)
 create mode 100644 README2.md
 create mode 100644 build.sh
 create mode 100644 missing_branding_files/stubinstaller/bgstub.jpg
 create mode 100644 missing_branding_files/stubinstaller/installing_page.css
 create mode 100644 missing_branding_files/stubinstaller/profile_cleanup_page.css

diff --git a/README2.md b/README2.md
new file mode 100644
index 0000000..2f1e02b
--- /dev/null
+++ b/README2.md
@@ -0,0 +1,53 @@
+Just some notes
+---------------
+
+To build, one should use the following:
+
+$ time bash build.sh fetch prepare build package
+
+
+the final .zip is in:
+  C:\mozilla-source\firefox-85.0\obj-x86_64-pc-mingw32\dist
+
+
+* problem with old sed. does not recognize -z. using the one from Git might be a work around.
+
+
+BRANDING: resource files
+========================
+
+* build fail on missing stubinstaller (might be a FF bug as it should just take missing
+stuff from the nightly branding folder?)
+
+$ mkdir stubinstaller
+$ cp bgstub.jpg stubinstaller
+$ pwd
+/c/mozilla-source/firefox-85.0/browser/branding/librewolf
+$
+
+* checking all the different files in nightly and librewolf
+
+$ cd nightly
+$ find . | sort > /c/mozilla-source/branding-nightly.txt
+$ cd ../librewolf/
+$ find . | sort > /c/mozilla-source/branding-librewolf.txt
+
+
+$ diff branding-nightly.txt branding-librewolf.txt
+4a5,6
+> ./bgstub.jpg
+> ./bgstub_2x.jpg
+7a10
+> ./content/about-background.png
+9,10d11
+< ./content/about-logo.svg
+< ./content/about-logo@2x.png
+14,15d14
+< ./content/aboutlogins.svg
+< ./content/firefox-wordmark.svg
+22,24d20
+< ./default22.png
+< ./default24.png
+< ./default256.png
+$
+
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..7171839
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,190 @@
+# build.sh - build librewolf on windows
+# derived from https://gitlab.com/librewolf-community/browser/linux/-/blob/master/PKGBUILD
+
+pkgname=librewolf
+_pkgname=LibreWolf
+
+pkgver=85.0
+#srcdir=/c/mozilla-source
+
+
+
+fetch() {
+    rm -f firefox-$pkgver.source.tar.xz
+    wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+    
+    rm -rf settings commmon
+    git clone https://gitlab.com/$pkgname-community/browser/common.git
+    git clone https://gitlab.com/$pkgname-community/settings.git
+
+    rm -f megabar.patch remove_addons.patch unity-menubar.patch
+    wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
+    wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch
+    wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch
+}
+
+
+
+
+
+prepare() {
+    rm -rf firefox-$pkgver
+    tar xf firefox-$pkgver.source.tar.xz
+
+    cd firefox-$pkgver
+    
+    cat >../mozconfig <<END
+ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+
+
+# as suggested by Mental Outlaw in https://www.youtube.com/watch?v=L2otiFy4ADI
+ac_add_options --disable-webrtc
+
+
+# Branding
+ac_add_options --enable-update-channel=release
+ac_add_options --with-app-name=${pkgname}
+ac_add_options --with-app-basename=${_pkgname}
+ac_add_options --with-branding=browser/branding/${pkgname}
+ac_add_options --with-distribution-id=io.gitlab.${pkgname}-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+END
+
+
+    patch -p1 -i ../remove_addons.patch
+    patch -p1 -i ../megabar.patch
+    patch -p1 -i ../unity-menubar.patch
+
+
+  
+    # Disabling Pocket
+    sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
+    # this one only to remove an annoying error message:
+    sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
+
+
+    
+    # Remove Internal Plugin Certificates
+    _cert_sed='s#if (aCert.organizationalUnit == "Mozilla [[:alpha:]]\+") {\n'
+    _cert_sed+='[[:blank:]]\+return AddonManager\.SIGNEDSTATE_[[:upper:]]\+;\n'
+    _cert_sed+='[[:blank:]]\+}#'
+    _cert_sed+='// NOTE: removed#g'
+	
+    # FIXME: on windows: the sed.exe in MozBuild is too old, no -z, using the one from Git instead.
+    mysed='/c/mozilla-source/Git/usr/bin/sed.exe'
+    $mysed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm
+
+
+  
+    # allow SearchEngines option in non-ESR builds
+    sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json
+
+    _settings_services_sed='s#firefox.settings.services.mozilla.com#f.s.s.m.c.qjz9zk#g'
+
+    # stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10)
+    sed "$_settings_services_sed" -i browser/components/newtab/data/content/activity-stream.bundle.js
+    sed "$_settings_services_sed" -i modules/libpref/init/all.js
+    sed "$_settings_services_sed" -i services/settings/Utils.jsm
+    sed "$_settings_services_sed" -i toolkit/components/search/SearchUtils.jsm
+
+
+
+    
+    rm -f ../common/source_files/mozconfig
+    cp -r ../common/source_files/* ./
+
+    # FIX: on windows: the stubinstaller folder is missing from the librewolf branding folder.
+    cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf
+
+    # just a straight copy for now..
+    cp ../mozconfig .mozconfig
+    
+    cd ..
+}
+
+
+
+
+
+
+
+build() {
+    cd firefox-$pkgver
+
+    ./mach build
+
+    cd ..
+}
+
+
+package() {
+    cd firefox-$pkgver
+
+    ./mach package
+
+    # apply the LibreWolf settings
+    cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
+    # recreate the zip file..
+    cd obj-x86_64-pc-mingw32/dist
+    rm -f librewolf-85.0.en-US.win64.txt librewolf-85.0.en-US.win64.zip
+    zip -r9 librewolf-85.0.en-US.win64.zip librewolf
+    cd ../..
+    
+    cd ..
+}
+
+
+
+
+
+
+# windows: change $PATH to find all the build tools in .mozbuild
+# this might do the trick on macos aswell
+export TPATH=$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm
+export PATH=$TPATH:$PATH
+
+
+
+# process commandline arguments and do something
+done_something=0
+if [[ "$*" == *fetch* ]]; then
+    fetch
+    done_something=1
+fi
+if [[ "$*" == *prepare* ]]; then
+    prepare
+    done_something=1
+fi
+if [[ "$*" == *build* ]]; then
+    build
+    done_something=1
+fi
+if [[ "$*" == *package* ]]; then
+    package
+    done_something=1
+fi
+
+if (( done_something == 0 )); then
+    echo "Usage: $0 fetch | prepare | build | package"
+fi
+
diff --git a/missing_branding_files/stubinstaller/bgstub.jpg b/missing_branding_files/stubinstaller/bgstub.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..69cd6b8609453784e53a2e756827114836fc6708
GIT binary patch
literal 1228
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG&LEbq(x1cDsxHvUMA*oU!s~|O9w<t9kD)|34
zLkj~h5b*Kx2?+3shzW~{$Vp2|O3UdgC;_3ai<XfV5V_cRTAN#Y+T?_Kdxz%KW+rFW
zPH%6YzHjTkpFjUIQfk2eLkxl(jI)^*Ff%GKFbOg;3o`yc!XOIv2Lm!-|9^{t1LQjf
zhULiOqwLWTzzhLk8WMpd7Gyba5@HfS78+nSKOToN4?2emfU_S`kR5<#N=ADIj&_h&
W1kqJ2fP^_CNX2|SDwv@vZUO)m&RH7(

literal 0
HcmV?d00001

diff --git a/missing_branding_files/stubinstaller/installing_page.css b/missing_branding_files/stubinstaller/installing_page.css
new file mode 100644
index 0000000..8044838
--- /dev/null
+++ b/missing_branding_files/stubinstaller/installing_page.css
@@ -0,0 +1,61 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  color: white;
+}
+
+#label,
+#progress_background,
+#blurb {
+  text-align: center;
+  margin: 20px 30px;
+}
+
+#label {
+  font-size: 40px;
+  margin-top: 100px;
+  margin-bottom: 20px;
+}
+
+#progress_background {
+  margin: 0 auto;
+  width: 60%;
+  height: 24px;
+  background-color: white;
+}
+
+body.high-contrast #progress_background {
+  outline: solid;
+}
+
+#progress_bar {
+  margin: 0;
+  width: 0%;
+  height: 100%;
+  background-color: #00AAFF;
+}
+
+/* In high contrast mode, fill the entire progress bar with its border. */
+body.high-contrast #progress_bar {
+  /* This border should be the height of progress_background. */
+  border-top: 24px solid;
+  box-sizing: border-box;
+}
+
+/* This layout doesn't want the header or content text. */
+#header, #content {
+  display: none;
+}
+
+#blurb {
+  font-size: 20px;
+}
+
+/* The footer goes in the bottom right corner. */
+#footer {
+  position: fixed;
+  right: 50px;
+  bottom: 59px;
+}
diff --git a/missing_branding_files/stubinstaller/profile_cleanup_page.css b/missing_branding_files/stubinstaller/profile_cleanup_page.css
new file mode 100644
index 0000000..2d9c3ad
--- /dev/null
+++ b/missing_branding_files/stubinstaller/profile_cleanup_page.css
@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  color: white;
+}
+
+#header,
+#refreshCheckboxContainer,
+#refreshButtonContainer {
+  text-align: center;
+  margin-left: 40px;
+  margin-right: 40px;
+  margin-bottom: 30px;
+}
+
+#header {
+  font-size: 35px;
+  font-weight: normal;
+  margin-top: 45px;
+}
+
+#refreshCheckbox {
+  vertical-align: middle;
+}
+
+#checkboxLabel {
+  font-size: 13px;
+}
+
+#refreshButton {
+  padding: 8px 40px;
+  font-size: 15px;
+}
+
+/* The footer goes in the bottom right corner. */
+#footer {
+  position: fixed;
+  right: 50px;
+  bottom: 59px;
+}

From 4d323b3f51eb173a4620cf5c28b5c7c02d998e77 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:03:46 +0100
Subject: [PATCH 02/29] changes

---
 README2.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README2.md b/README2.md
index 2f1e02b..f756ee8 100644
--- a/README2.md
+++ b/README2.md
@@ -1,13 +1,19 @@
 Just some notes
 ---------------
 
-To build, one should use the following:
+Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will
+install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire
+C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option,
+and to get sha256sum.exe.
+
+
+To build, one should use the following command in the checked out windows repo:
 
 $ time bash build.sh fetch prepare build package
 
 
 the final .zip is in:
-  C:\mozilla-source\firefox-85.0\obj-x86_64-pc-mingw32\dist
+  C:\mozilla-source\windows\firefox-85.0\obj-x86_64-pc-mingw32\dist
 
 
 * problem with old sed. does not recognize -z. using the one from Git might be a work around.

From 79e7e2b21b3830909e439d202cd0b889b04f2e8e Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:10:16 +0100
Subject: [PATCH 03/29] changes

---
 .gitignore  | 4 ++++
 .gitmodules | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .gitmodules

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b870e9f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+firefox-*.tar.xz
+megabar.patch
+remove_addons.patch
+unity-menubar.patch
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2869fea
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "settings"]
+  path = settings
+  url = https://gitlab.com/librewolf-community/settings.git

From c542e80b8af8ae026448f12f6169bc46a76a8775 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:12:21 +0100
Subject: [PATCH 04/29] changes

---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index 2869fea..68523b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "settings"]
   path = settings
   url = https://gitlab.com/librewolf-community/settings.git
+

From 22914f232c9dae9986b56e206f270b04562b63ff Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:28:21 +0100
Subject: [PATCH 05/29] changes

---
 .gitmodules | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 68523b2..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "settings"]
-  path = settings
-  url = https://gitlab.com/librewolf-community/settings.git
-

From 0586f8ecd63140d511f0a962dd1999cfe1cf5730 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:33:12 +0100
Subject: [PATCH 06/29] addes settings submodule

---
 .gitmodules | 3 +++
 settings    | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 settings

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1d63467
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "settings"]
+	path = settings
+	url = https://gitlab.com/librewolf-community/settings.git
diff --git a/settings b/settings
new file mode 160000
index 0000000..640b375
--- /dev/null
+++ b/settings
@@ -0,0 +1 @@
+Subproject commit 640b375dc02c5b089f678ed16b0232d1c0cc0721

From fd668d8a74450dd2d05b5c9dcaf62e3de2f0b6f3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:44:17 +0100
Subject: [PATCH 07/29] changes

---
 .gitignore  | 3 ++-
 .gitmodules | 3 +++
 build.sh    | 4 +---
 common      | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 160000 common

diff --git a/.gitignore b/.gitignore
index b870e9f..322c7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-firefox-*.tar.xz
+firefox-*
 megabar.patch
 remove_addons.patch
 unity-menubar.patch
+mozconfig
diff --git a/.gitmodules b/.gitmodules
index 1d63467..9e19064 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "settings"]
 	path = settings
 	url = https://gitlab.com/librewolf-community/settings.git
+[submodule "common"]
+	path = common
+	url = https://gitlab.com/librewolf-community/browser/common.git
diff --git a/build.sh b/build.sh
index 7171839..81fd5ab 100644
--- a/build.sh
+++ b/build.sh
@@ -13,9 +13,7 @@ fetch() {
     rm -f firefox-$pkgver.source.tar.xz
     wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
     
-    rm -rf settings commmon
-    git clone https://gitlab.com/$pkgname-community/browser/common.git
-    git clone https://gitlab.com/$pkgname-community/settings.git
+    # the settings and common submodules should be checked out to allow the build
 
     rm -f megabar.patch remove_addons.patch unity-menubar.patch
     wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
diff --git a/common b/common
new file mode 160000
index 0000000..9995c8b
--- /dev/null
+++ b/common
@@ -0,0 +1 @@
+Subproject commit 9995c8b275e2a06db3e0b24974b302a63791fc24

From 85f138650feed3c8ccad64a02b5957bff39bd051 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:55:03 +0100
Subject: [PATCH 08/29] updates

---
 build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 81fd5ab..9d8e2ef 100644
--- a/build.sh
+++ b/build.sh
@@ -108,8 +108,11 @@ END
 
 
     
-    rm -f ../common/source_files/mozconfig
     cp -r ../common/source_files/* ./
+    # FIXME: this 'mozconfig' file in the 'common' submodule should be removed
+    # this submodule is purely for the branding. I imagine that we want the
+    # missing_branding_files into the 'common' submodule.
+    rm -f mozconfig
 
     # FIX: on windows: the stubinstaller folder is missing from the librewolf branding folder.
     cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf

From 2375039d41bb16276f501a03175742b081943bfa Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 02:21:09 +0100
Subject: [PATCH 09/29] updates

---
 .gitignore | 1 +
 build.sh   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 322c7c4..1929584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 firefox-*
+librewolf-*
 megabar.patch
 remove_addons.patch
 unity-menubar.patch
diff --git a/build.sh b/build.sh
index 9d8e2ef..8129294 100644
--- a/build.sh
+++ b/build.sh
@@ -147,8 +147,10 @@ package() {
     cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
     # recreate the zip file..
     cd obj-x86_64-pc-mingw32/dist
-    rm -f librewolf-85.0.en-US.win64.txt librewolf-85.0.en-US.win64.zip
-    zip -r9 librewolf-85.0.en-US.win64.zip librewolf
+    rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
+    zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
+    /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
+    cp librewolf-$pkgver.en-US.win64.zip* ../../..
     cd ../..
     
     cd ..

From b665c22c594f753e82b12e26fd5b1951274561fa Mon Sep 17 00:00:00 2001
From: Stanzabird <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 01:26:07 +0000
Subject: [PATCH 10/29] Update README2.md

---
 README2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README2.md b/README2.md
index f756ee8..5dde730 100644
--- a/README2.md
+++ b/README2.md
@@ -13,7 +13,7 @@ $ time bash build.sh fetch prepare build package
 
 
 the final .zip is in:
-  C:\mozilla-source\windows\firefox-85.0\obj-x86_64-pc-mingw32\dist
+  C:\mozilla-source\windows
 
 
 * problem with old sed. does not recognize -z. using the one from Git might be a work around.

From 07cd4fabf39d3619463d9a8df07518ab95be79c3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 02:51:19 +0100
Subject: [PATCH 11/29] new version of the readme.md

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index a47e71e..612923d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,12 @@
 This repository is still a work in progress
+
+
+This build does require you to:
+
+* First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff
+* You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun)
+* Then clone the windows repo
+* cd into it, and build with: time bash build.sh fetch prepare build package
+* you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux 
+* This will produce a librewolf-85.0.en-US.win64.zip in this windows folder.
+

From 8d88df02fe52e67d353f67d457d4401d1a516935 Mon Sep 17 00:00:00 2001
From: Stanzabird <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 01:53:34 +0000
Subject: [PATCH 12/29] Update the text formatting

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 612923d..46ba00a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This build does require you to:
 * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff
 * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun)
 * Then clone the windows repo
-* cd into it, and build with: time bash build.sh fetch prepare build package
+* cd into it, and build with: **time bash build.sh fetch prepare build package**
 * you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux 
-* This will produce a librewolf-85.0.en-US.win64.zip in this windows folder.
+* This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder.
 

From 200dc9863316236f1fa39d80856fac0e097c462e Mon Sep 17 00:00:00 2001
From: Stanzabird <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 02:36:03 +0000
Subject: [PATCH 13/29] Update README2.md

---
 README2.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README2.md b/README2.md
index 5dde730..6edb326 100644
--- a/README2.md
+++ b/README2.md
@@ -24,7 +24,7 @@ BRANDING: resource files
 
 * build fail on missing stubinstaller (might be a FF bug as it should just take missing
 stuff from the nightly branding folder?)
-
+``
 $ mkdir stubinstaller
 $ cp bgstub.jpg stubinstaller
 $ pwd
@@ -56,4 +56,4 @@ $ diff branding-nightly.txt branding-librewolf.txt
 < ./default24.png
 < ./default256.png
 $
-
+``

From 24b84c0cbdb090e75671b733edbbdaef8d609b3b Mon Sep 17 00:00:00 2001
From: Stanzabird <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 02:37:28 +0000
Subject: [PATCH 14/29] Update README2.md

---
 README2.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README2.md b/README2.md
index 6edb326..792bf47 100644
--- a/README2.md
+++ b/README2.md
@@ -24,7 +24,8 @@ BRANDING: resource files
 
 * build fail on missing stubinstaller (might be a FF bug as it should just take missing
 stuff from the nightly branding folder?)
-``
+
+```
 $ mkdir stubinstaller
 $ cp bgstub.jpg stubinstaller
 $ pwd
@@ -56,4 +57,5 @@ $ diff branding-nightly.txt branding-librewolf.txt
 < ./default24.png
 < ./default256.png
 $
-``
+```
+

From c998b1538751bba53cb562047f70ae5b1cc219b6 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 09:12:46 +0100
Subject: [PATCH 15/29] changes

---
 build.sh | 81 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/build.sh b/build.sh
index 8129294..6d926fe 100644
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,6 @@ pkgname=librewolf
 _pkgname=LibreWolf
 
 pkgver=85.0
-#srcdir=/c/mozilla-source
 
 
 
@@ -23,8 +22,6 @@ fetch() {
 
 
 
-
-
 prepare() {
     rm -rf firefox-$pkgver
     tar xf firefox-$pkgver.source.tar.xz
@@ -69,31 +66,39 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
 END
 
 
+
     patch -p1 -i ../remove_addons.patch
     patch -p1 -i ../megabar.patch
     patch -p1 -i ../unity-menubar.patch
 
 
-  
+
     # Disabling Pocket
     sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
     # this one only to remove an annoying error message:
     sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
 
 
-    
+
     # Remove Internal Plugin Certificates
     _cert_sed='s#if (aCert.organizationalUnit == "Mozilla [[:alpha:]]\+") {\n'
     _cert_sed+='[[:blank:]]\+return AddonManager\.SIGNEDSTATE_[[:upper:]]\+;\n'
     _cert_sed+='[[:blank:]]\+}#'
     _cert_sed+='// NOTE: removed#g'
-	
-    # FIXME: on windows: the sed.exe in MozBuild is too old, no -z, using the one from Git instead.
-    mysed='/c/mozilla-source/Git/usr/bin/sed.exe'
+    # on windows: the sed.exe in MozBuild is too old, no -z, using the one from Git instead.
+    if [ -f '/c/mozilla-build/start-shell.bat' ]; then
+	mysed='/c/mozilla-source/Git/usr/bin/sed.exe'
+	if [ ! -f $mysed ]; then
+	    echo 'build.sh: For the build to work, copy "c:\program files\Git" folder into "c:\mozilla-source".'
+	    exit
+	fi
+    else
+	$mysed='sed'
+    fi
     $mysed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm
 
 
-  
+
     # allow SearchEngines option in non-ESR builds
     sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json
 
@@ -107,28 +112,25 @@ END
 
 
 
-    
     cp -r ../common/source_files/* ./
+
     # FIXME: this 'mozconfig' file in the 'common' submodule should be removed
-    # this submodule is purely for the branding. I imagine that we want the
-    # missing_branding_files into the 'common' submodule.
+    # this submodule is purely for the branding.
     rm -f mozconfig
 
-    # FIX: on windows: the stubinstaller folder is missing from the librewolf branding folder.
+    # FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder.
+    # this might be a bug in FF however as it seems to take missing branding resources from
+    # the nightly branding. We probably want this stuff merged into the 'common' submodule.
     cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf
 
     # just a straight copy for now..
     cp ../mozconfig .mozconfig
-    
+
     cd ..
 }
 
 
 
-
-
-
-
 build() {
     cd firefox-$pkgver
 
@@ -138,13 +140,21 @@ build() {
 }
 
 
+
 package() {
     cd firefox-$pkgver
 
     ./mach package
 
+    cd ..
+}
+
+installer_win() {
+    cd firefox-$pkgver
+    
     # apply the LibreWolf settings
     cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
+    
     # recreate the zip file..
     cd obj-x86_64-pc-mingw32/dist
     rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
@@ -152,19 +162,26 @@ package() {
     /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
     cp librewolf-$pkgver.en-US.win64.zip* ../../..
     cd ../..
-    
+
+    cd ..
+}
+
+installer_macos() {
+    cd firefox-$pkgver
+
+    # TODO: we want to apply the librewolf settings and make the .dmg file here.
+    echo 'build.sh: installer_macos() Not implemented yet.'
     cd ..
 }
 
 
 
-
-
-
 # windows: change $PATH to find all the build tools in .mozbuild
-# this might do the trick on macos aswell
-export TPATH=$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm
-export PATH=$TPATH:$PATH
+# this might do the trick on macos aswell?
+if [ -f '/c/mozilla-build/start-shell.bat' ]; then
+    export TPATH=$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm
+    export PATH=$TPATH:$PATH
+fi
 
 
 
@@ -186,8 +203,16 @@ if [[ "$*" == *package* ]]; then
     package
     done_something=1
 fi
-
-if (( done_something == 0 )); then
-    echo "Usage: $0 fetch | prepare | build | package"
+if [[ "$*" == *installer_win* ]]; then
+    installer_win
+    done_something=1
+fi
+if [[ "$*" == *installer_macos* ]]; then
+    installer_macos
+    done_something=1
 fi
 
+if (( done_something == 0 )); then
+    echo "Usage: $0 fetch | prepare | build | package | installer_win | installer_mac"
+    exit
+fi

From 312be4b89b4908e6a829742d278b1ed489d5d0e3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 09:15:01 +0100
Subject: [PATCH 16/29] changes

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index 6d926fe..50f3511 100644
--- a/build.sh
+++ b/build.sh
@@ -160,6 +160,7 @@ installer_win() {
     rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
     zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
     /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
+    rm -f ../../../librewolf-$pkgver.en-US.win64.zip*
     cp librewolf-$pkgver.en-US.win64.zip* ../../..
     cd ../..
 

From e8bc848ec8431ca2b38ee462dfb3152a2a610fa3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 10:50:56 +0100
Subject: [PATCH 17/29] Removed install_script.txt because the profile folder
 requested here is checked to be Ok.

---
 install_script.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 install_script.txt

diff --git a/install_script.txt b/install_script.txt
deleted file mode 100644
index 081cb68..0000000
--- a/install_script.txt
+++ /dev/null
@@ -1 +0,0 @@
-#C:\Users\<username>\AppData\Roaming\LibreWolf\Profiles\xxxxxxxx.default
\ No newline at end of file

From 605e073162e4deebdce4438044264aca01d39ea3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 18:00:10 +0100
Subject: [PATCH 18/29] Updated the readme a bit

---
 README.md | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 46ba00a..0ee0f37 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,22 @@
-This repository is still a work in progress
+This repository is still a work in progress.
 
+But we have a zip file available for testing right now..
 
-This build does require you to:
+Download link to the prerelease alpha zip file is [here](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
+
+To do:
+
+* Creating an installer.
+* Branding issues, include a good icon for librewolf.exe
+* Other Branding Issues
+* Improve this README.md to contain detailed instructions on how to build.
+
+For now, if you want to attempt to build, this build does require you to:
 
 * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff
 * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun)
 * Then clone the windows repo
-* cd into it, and build with: **time bash build.sh fetch prepare build package**
+* cd into it, and build with: **time bash build.sh fetch prepare build package installer_win**
 * you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux 
 * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder.
 

From 3cf15ede146c2e235345345a2f414915998bf657 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Fri, 5 Feb 2021 23:15:23 +0100
Subject: [PATCH 19/29] split the installer stuff into a seperate shell script

---
 build.sh         | 68 +++++++++++++++++++++---------------------------
 installer-win.sh | 11 ++++++++
 2 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 installer-win.sh

diff --git a/build.sh b/build.sh
index 50f3511..d10600e 100644
--- a/build.sh
+++ b/build.sh
@@ -151,31 +151,14 @@ package() {
 
 installer_win() {
     cd firefox-$pkgver
-    
-    # apply the LibreWolf settings
-    cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
-    
-    # recreate the zip file..
-    cd obj-x86_64-pc-mingw32/dist
-    rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
-    zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
-    /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
-    rm -f ../../../librewolf-$pkgver.en-US.win64.zip*
-    cp librewolf-$pkgver.en-US.win64.zip* ../../..
-    cd ../..
+
+    # there is just too much garbage in this installer function to
+    # have it all here..
+    . installer-win.sh
 
     cd ..
 }
 
-installer_macos() {
-    cd firefox-$pkgver
-
-    # TODO: we want to apply the librewolf settings and make the .dmg file here.
-    echo 'build.sh: installer_macos() Not implemented yet.'
-    cd ..
-}
-
-
 
 # windows: change $PATH to find all the build tools in .mozbuild
 # this might do the trick on macos aswell?
@@ -188,32 +171,39 @@ fi
 
 # process commandline arguments and do something
 done_something=0
-if [[ "$*" == *fetch* ]]; then
+if [[ "$*" == *all* ]]; then
     fetch
-    done_something=1
-fi
-if [[ "$*" == *prepare* ]]; then
     prepare
-    done_something=1
-fi
-if [[ "$*" == *build* ]]; then
     build
-    done_something=1
-fi
-if [[ "$*" == *package* ]]; then
     package
-    done_something=1
-fi
-if [[ "$*" == *installer_win* ]]; then
     installer_win
     done_something=1
-fi
-if [[ "$*" == *installer_macos* ]]; then
-    installer_macos
-    done_something=1
+else
+    if [[ "$*" == *fetch* ]]; then
+	fetch
+	done_something=1
+    fi
+    if [[ "$*" == *prepare* ]]; then
+	prepare
+	done_something=1
+    fi
+    if [[ "$*" == *build* ]]; then
+	build
+	done_something=1
+    fi
+    if [[ "$*" == *package* ]]; then
+	package
+	done_something=1
+    fi
+    if [[ "$*" == *installer_win* ]]; then
+	installer_win
+	done_something=1
+    fi
 fi
 
+
 if (( done_something == 0 )); then
-    echo "Usage: $0 fetch | prepare | build | package | installer_win | installer_mac"
+    echo "Usage: $0 fetch | prepare | build | package | installer_win"
+    echo "       use the parameter 'all' to just do everything."
     exit
 fi
diff --git a/installer-win.sh b/installer-win.sh
new file mode 100644
index 0000000..9a917ff
--- /dev/null
+++ b/installer-win.sh
@@ -0,0 +1,11 @@
+# apply the LibreWolf settings
+cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
+    
+# recreate the zip file..
+cd obj-x86_64-pc-mingw32/dist
+rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
+zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
+/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
+rm -f ../../../librewolf-$pkgver.en-US.win64.zip*
+cp librewolf-$pkgver.en-US.win64.zip* ../../..
+cd ../..

From a783187ed4d8a8aab1946eafd5600ee73fea5dd3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 00:25:48 +0100
Subject: [PATCH 20/29] made installer_win easy to use (tab completion)

---
 build.sh                          | 38 ++++++++++++-------------------
 installer-win.sh => installer_win |  0
 2 files changed, 14 insertions(+), 24 deletions(-)
 rename installer-win.sh => installer_win (100%)

diff --git a/build.sh b/build.sh
index d10600e..70a8914 100644
--- a/build.sh
+++ b/build.sh
@@ -154,7 +154,7 @@ installer_win() {
 
     # there is just too much garbage in this installer function to
     # have it all here..
-    . installer-win.sh
+    . ../installer_win
 
     cd ..
 }
@@ -171,39 +171,29 @@ fi
 
 # process commandline arguments and do something
 done_something=0
-if [[ "$*" == *all* ]]; then
+if [[ "$*" == *fetch* ]]; then
     fetch
+    done_something=1
+fi
+if [[ "$*" == *prepare* ]]; then
     prepare
+    done_something=1
+fi
+if [[ "$*" == *build* ]]; then
     build
+    done_something=1
+fi
+if [[ "$*" == *package* ]]; then
     package
+    done_something=1
+fi
+if [[ "$*" == *installer_win* ]]; then
     installer_win
     done_something=1
-else
-    if [[ "$*" == *fetch* ]]; then
-	fetch
-	done_something=1
-    fi
-    if [[ "$*" == *prepare* ]]; then
-	prepare
-	done_something=1
-    fi
-    if [[ "$*" == *build* ]]; then
-	build
-	done_something=1
-    fi
-    if [[ "$*" == *package* ]]; then
-	package
-	done_something=1
-    fi
-    if [[ "$*" == *installer_win* ]]; then
-	installer_win
-	done_something=1
-    fi
 fi
 
 
 if (( done_something == 0 )); then
     echo "Usage: $0 fetch | prepare | build | package | installer_win"
-    echo "       use the parameter 'all' to just do everything."
     exit
 fi
diff --git a/installer-win.sh b/installer_win
similarity index 100%
rename from installer-win.sh
rename to installer_win

From 54bd5916c8c7d7c458651b06647026979ca92e3c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 13:45:32 +0100
Subject: [PATCH 21/29] first version of the installer

---
 .gitignore                         |   2 +
 build.sh                           |   8 ++-
 installer_win                      |  11 ----
 installer_win.sh                   |  24 +++++++++
 librewolf.nsi                      |  81 +++++++++++++++++++++++++++++
 missing_branding_files/firefox.ico | Bin 0 -> 32038 bytes
 6 files changed, 113 insertions(+), 13 deletions(-)
 delete mode 100644 installer_win
 create mode 100644 installer_win.sh
 create mode 100644 librewolf.nsi
 create mode 100644 missing_branding_files/firefox.ico

diff --git a/.gitignore b/.gitignore
index 1929584..6580505 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ megabar.patch
 remove_addons.patch
 unity-menubar.patch
 mozconfig
+Makefile
+librewolf
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 70a8914..f071bc3 100644
--- a/build.sh
+++ b/build.sh
@@ -154,7 +154,7 @@ installer_win() {
 
     # there is just too much garbage in this installer function to
     # have it all here..
-    . ../installer_win
+    . ../installer_win.sh
 
     cd ..
 }
@@ -194,6 +194,10 @@ fi
 
 
 if (( done_something == 0 )); then
-    echo "Usage: $0 fetch | prepare | build | package | installer_win"
+    fetch
+    prepare
+    build
+    package
+    installer_win
     exit
 fi
diff --git a/installer_win b/installer_win
deleted file mode 100644
index 9a917ff..0000000
--- a/installer_win
+++ /dev/null
@@ -1,11 +0,0 @@
-# apply the LibreWolf settings
-cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
-    
-# recreate the zip file..
-cd obj-x86_64-pc-mingw32/dist
-rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
-zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
-/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
-rm -f ../../../librewolf-$pkgver.en-US.win64.zip*
-cp librewolf-$pkgver.en-US.win64.zip* ../../..
-cd ../..
diff --git a/installer_win.sh b/installer_win.sh
new file mode 100644
index 0000000..ede8372
--- /dev/null
+++ b/installer_win.sh
@@ -0,0 +1,24 @@
+# apply the LibreWolf settings
+cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
+    
+# recreate the zip file..
+
+cd obj-x86_64-pc-mingw32/dist
+# clean garbage files
+rm -rf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe
+# be sure to remove the previous zip file..
+rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
+zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
+/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
+# copy the resulting zip file
+rm -vf ../../../librewolf-$pkgver.en-US.win64.zip*
+cp -v librewolf-$pkgver.en-US.win64.zip* ../../..
+cd ../..
+
+# now to try to make the installer
+pushd ..
+rm -vrf librewolf
+unzip librewolf-$pkgver.en-US.win64.zip
+cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico
+makensis-3.01.exe librewolf.nsi
+popd
diff --git a/librewolf.nsi b/librewolf.nsi
new file mode 100644
index 0000000..ff1e667
--- /dev/null
+++ b/librewolf.nsi
@@ -0,0 +1,81 @@
+#
+# Change these values to fit your application...
+#
+
+!define APPNAME "LibreWolf" # Full app name, like: Gtk+ 2.0 Hello World
+!define PROGNAME "librewolf" # executable name, like: gtk2hello
+!define PROG_VERSION "85.0" # the program version, like: 0.3.0
+!define ICON_NAME "librewolf.ico" # filename of icon to use for this app, this file should be in src/
+!define COMPANYNAME "LibreWolf" # Your name, or company (or just the program name)
+!define ESTIMATED_SIZE 190000 # Estimated size (in KB) of installed program for use in "add or remove programs" / 190 MB
+
+#
+# The actual installer/uninstaller, you should not need to change much here below
+#
+
+Name "${PROGNAME}"
+OutFile "${PROGNAME}-${PROG_VERSION}.en-US.win64-setup.exe"
+InstallDir $PROGRAMFILES64\${APPNAME}
+RequestExecutionLevel admin
+
+Page directory
+Page instfiles
+
+function .onInit
+	setShellVarContext all
+functionEnd
+ 
+Section "${PROGNAME}"
+
+	# Copy files
+	SetOutPath $INSTDIR
+	File /r librewolf\*.*
+
+	# Start Menu
+	createDirectory "$SMPROGRAMS\${COMPANYNAME}"
+	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\${PROGNAME}.exe" "" "$INSTDIR\${ICON_NAME}"
+
+	# Uninstaller 
+	writeUninstaller "$INSTDIR\uninstall.exe"
+
+	# Registry information for add/remove programs
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${APPNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\${ICON_NAME}$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "${COMPANYNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "${PROG_VERSION}"
+	# There is no option for modifying or repairing the install
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoModify" 1
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoRepair" 1
+	# Set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "EstimatedSize" ${ESTIMATED_SIZE}
+
+SectionEnd
+
+# Before uninstall, ask for confirmation
+function un.onInit
+	SetShellVarContext all
+ 
+	#Verify the uninstaller - last chance to back out
+	MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next
+		Abort
+	next:
+functionEnd
+
+# Uninstaller
+section "uninstall"
+
+	# Remove Start Menu launcher
+	delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk"
+	# Try to remove the Start Menu folder - this will only happen if it is empty
+	rmDir "$SMPROGRAMS\${COMPANYNAME}"
+ 
+	# Remove files
+	rmDir /r $INSTDIR
+
+	# Remove uninstaller information from the registry
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
+
+sectionEnd
diff --git a/missing_branding_files/firefox.ico b/missing_branding_files/firefox.ico
new file mode 100644
index 0000000000000000000000000000000000000000..30a72f168d8f1cb8689dc7913bc42c7ce70a4f92
GIT binary patch
literal 32038
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

literal 0
HcmV?d00001


From 27337bcb5ddd3d90ac90a59853f33f32af9ad825 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 19:01:36 +0100
Subject: [PATCH 22/29] changes

---
 README.md        | 79 ++++++++++++++++++++++++++++++++++++++++++------
 README2.md       | 47 ----------------------------
 build.sh         |  4 +--
 installer_win.sh | 28 ++++++++---------
 4 files changed, 86 insertions(+), 72 deletions(-)

diff --git a/README.md b/README.md
index 0ee0f37..c7f9391 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,83 @@
+LibreWolf for Win64
+-------------------
+
 This repository is still a work in progress.
 
-But we have a zip file available for testing right now..
+But we have a zip file and an installer available for testing right now..
 
-Download link to the prerelease alpha zip file is [here](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
+Download link to this prerelease is:
+* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
+* Installer file is: [librewolf-85.0.en-US.win64-setup.exe]().
 
-To do:
 
-* Creating an installer.
-* Branding issues, include a good icon for librewolf.exe
-* Other Branding Issues
-* Improve this README.md to contain detailed instructions on how to build.
+Building the package:
+---------------------
 
 For now, if you want to attempt to build, this build does require you to:
 
 * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff
 * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun)
 * Then clone the windows repo
-* cd into it, and build with: **time bash build.sh fetch prepare build package installer_win**
-* you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux 
+* cd into it, and build with: **time bash build.sh**
+* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux 
 * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder.
 
+Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will
+install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire
+C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option,
+and to get sha256sum.exe.
+
+build.sh
+--------
+
+You can perform all the steps on one go, or perform the build steps individually, to note:
+* build.sh fetch prepare build package installer_win
+
+To do:
+------
+
+* Branding issues.
+* Improve this README.md to contain better, detailed instructions on how to build.
+* problem with old sed. does not recognize -z. using the one from Git might be a work around.
+
+
+Branding issue: resource files
+------------------------------
+
+* This section is just some notes.
+* Build fail on missing stubinstaller (might be a FF bug as it should just take missing
+stuff from the nightly branding folder?)
+
+```
+$ mkdir stubinstaller
+$ cp bgstub.jpg stubinstaller
+$ pwd
+/c/mozilla-source/firefox-85.0/browser/branding/librewolf
+$
+
+* checking all the different files in nightly and librewolf
+
+$ cd nightly
+$ find . | sort > /c/mozilla-source/branding-nightly.txt
+$ cd ../librewolf/
+$ find . | sort > /c/mozilla-source/branding-librewolf.txt
+
+
+$ diff branding-nightly.txt branding-librewolf.txt
+4a5,6
+> ./bgstub.jpg
+> ./bgstub_2x.jpg
+7a10
+> ./content/about-background.png
+9,10d11
+< ./content/about-logo.svg
+< ./content/about-logo@2x.png
+14,15d14
+< ./content/aboutlogins.svg
+< ./content/firefox-wordmark.svg
+22,24d20
+< ./default22.png
+< ./default24.png
+< ./default256.png
+$
+```
diff --git a/README2.md b/README2.md
index 792bf47..73c93b4 100644
--- a/README2.md
+++ b/README2.md
@@ -1,12 +1,6 @@
 Just some notes
 ---------------
 
-Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will
-install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire
-C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option,
-and to get sha256sum.exe.
-
-
 To build, one should use the following command in the checked out windows repo:
 
 $ time bash build.sh fetch prepare build package
@@ -16,46 +10,5 @@ the final .zip is in:
   C:\mozilla-source\windows
 
 
-* problem with old sed. does not recognize -z. using the one from Git might be a work around.
 
 
-BRANDING: resource files
-========================
-
-* build fail on missing stubinstaller (might be a FF bug as it should just take missing
-stuff from the nightly branding folder?)
-
-```
-$ mkdir stubinstaller
-$ cp bgstub.jpg stubinstaller
-$ pwd
-/c/mozilla-source/firefox-85.0/browser/branding/librewolf
-$
-
-* checking all the different files in nightly and librewolf
-
-$ cd nightly
-$ find . | sort > /c/mozilla-source/branding-nightly.txt
-$ cd ../librewolf/
-$ find . | sort > /c/mozilla-source/branding-librewolf.txt
-
-
-$ diff branding-nightly.txt branding-librewolf.txt
-4a5,6
-> ./bgstub.jpg
-> ./bgstub_2x.jpg
-7a10
-> ./content/about-background.png
-9,10d11
-< ./content/about-logo.svg
-< ./content/about-logo@2x.png
-14,15d14
-< ./content/aboutlogins.svg
-< ./content/firefox-wordmark.svg
-22,24d20
-< ./default22.png
-< ./default24.png
-< ./default256.png
-$
-```
-
diff --git a/build.sh b/build.sh
index f071bc3..b09c882 100644
--- a/build.sh
+++ b/build.sh
@@ -160,6 +160,7 @@ installer_win() {
 }
 
 
+
 # windows: change $PATH to find all the build tools in .mozbuild
 # this might do the trick on macos aswell?
 if [ -f '/c/mozilla-build/start-shell.bat' ]; then
@@ -192,12 +193,11 @@ if [[ "$*" == *installer_win* ]]; then
     done_something=1
 fi
 
-
+# by default, do the whole thing..
 if (( done_something == 0 )); then
     fetch
     prepare
     build
     package
     installer_win
-    exit
 fi
diff --git a/installer_win.sh b/installer_win.sh
index ede8372..002adbe 100644
--- a/installer_win.sh
+++ b/installer_win.sh
@@ -2,23 +2,23 @@
 cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf
     
 # recreate the zip file..
-
 cd obj-x86_64-pc-mingw32/dist
-# clean garbage files
-rm -rf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe
-# be sure to remove the previous zip file..
-rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
-zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
-/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
-# copy the resulting zip file
-rm -vf ../../../librewolf-$pkgver.en-US.win64.zip*
-cp -v librewolf-$pkgver.en-US.win64.zip* ../../..
+ # clean garbage files
+ rm -vrf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe
+ # be sure to remove the previous zip file..
+ rm -vf librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip
+ zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf
+ /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum
+ # copy the resulting zip file
+ rm -vf ../../../librewolf-$pkgver.en-US.win64.zip*
+ cp -v librewolf-$pkgver.en-US.win64.zip* ../../..
 cd ../..
 
 # now to try to make the installer
 pushd ..
-rm -vrf librewolf
-unzip librewolf-$pkgver.en-US.win64.zip
-cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico
-makensis-3.01.exe librewolf.nsi
+ rm -vrf librewolf
+ unzip librewolf-$pkgver.en-US.win64.zip
+ cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico
+ makensis-3.01.exe librewolf.nsi
+ /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64-setup.exe > librewolf-$pkgver.en-US.win64-setup.exe.sha256sum
 popd

From 20c1f67709f88f39b71657bbe655f98768aa9a0b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 19:01:44 +0100
Subject: [PATCH 23/29] changes

---
 README2.md | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 README2.md

diff --git a/README2.md b/README2.md
deleted file mode 100644
index 73c93b4..0000000
--- a/README2.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Just some notes
----------------
-
-To build, one should use the following command in the checked out windows repo:
-
-$ time bash build.sh fetch prepare build package
-
-
-the final .zip is in:
-  C:\mozilla-source\windows
-
-
-
-

From ae8e27122252111d5bba41072f3c07a505e2f0d8 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 22:16:54 +0100
Subject: [PATCH 24/29] changes

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7f9391..0eed006 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,9 @@ But we have a zip file and an installer available for testing right now..
 
 Download link to this prerelease is:
 * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
-* Installer file is: [librewolf-85.0.en-US.win64-setup.exe]().
+* The installer is: [librewolf-85.0.en-US.win64-setup.exe]().
 
+Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package (x64))[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required.
 
 Building the package:
 ---------------------

From 46c94f749c0dafbeff7ff82a84dd542fea3dda14 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 22:17:36 +0100
Subject: [PATCH 25/29] changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0eed006..6f86041 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Download link to this prerelease is:
 * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
 * The installer is: [librewolf-85.0.en-US.win64-setup.exe]().
 
-Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package (x64))[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required.
+Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package for x64)[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required.
 
 Building the package:
 ---------------------

From a9fddc53234767a2c97d3bf247660648ec234a8e Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 22:18:20 +0100
Subject: [PATCH 26/29] changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6f86041..dc4b12f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Download link to this prerelease is:
 * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
 * The installer is: [librewolf-85.0.en-US.win64-setup.exe]().
 
-Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package for x64)[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required.
+Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)])(https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required.
 
 Building the package:
 ---------------------

From 95b0b0b23fa196519e86cc474ef485ff665dbcca Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 22:18:57 +0100
Subject: [PATCH 27/29] changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc4b12f..f63c2d2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Download link to this prerelease is:
 * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
 * The installer is: [librewolf-85.0.en-US.win64-setup.exe]().
 
-Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)])(https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required.
+Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required.
 
 Building the package:
 ---------------------

From 277f27a839d9a5094327efdb9a1b8a439c770d88 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 23:06:51 +0100
Subject: [PATCH 28/29] changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f63c2d2..69ca76c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ But we have a zip file and an installer available for testing right now..
 
 Download link to this prerelease is:
 * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip).
-* The installer is: [librewolf-85.0.en-US.win64-setup.exe]().
+* The installer is: [librewolf-85.0.en-US.win64-setup.exe](https://gitlab.com/librewolf-community/browser/windows/uploads/ec6f7e7dc1096bf7730f503d856d3a9f/librewolf-85.0.en-US.win64-setup.exe).
 
 Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required.
 

From 5d316be30a4a64fb8ba3001c373564c21c43437d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 6 Feb 2021 23:16:18 +0100
Subject: [PATCH 29/29] changes

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 69ca76c..8a8af89 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ You can perform all the steps on one go, or perform the build steps individually
 To do:
 ------
 
+* Listing known issues in this README.md
 * Branding issues.
 * Improve this README.md to contain better, detailed instructions on how to build.
 * problem with old sed. does not recognize -z. using the one from Git might be a work around.