From 3cb41798c6d567466abcb1910ecbbb7c6bbd7365 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 8 Feb 2022 17:06:40 +0100
Subject: [PATCH] v97.0 (source release 2)

---
 .gitignore               |  1 -
 Makefile                 |  6 ++++--
 assets/update-version.py |  5 +----
 mk.py                    | 26 ++++++++++++++------------
 source_release           |  1 +
 version                  |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 source_release

diff --git a/.gitignore b/.gitignore
index bf473ee..1d61024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,3 @@ build_tag
 /docker/librewolf/mint20/deb/artifacts
 /docker/librewolf/ubuntu20/deb/artifacts
 /docker/*.log
-/source_release
diff --git a/Makefile b/Makefile
index dc61912..ce1458e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@ all : fetch build artifacts
 
 clean :
 	rm -rf work
-	rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version).en-US.win64.zip
+	rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip
 
 veryclean : clean
-	rm -rf librewolf-$(shell cat version)
+	rm -rf librewolf-$(shell cat version)-$(shell cat source_release)
 	rm -f source_release librewolf-$(shell cat version)-*.source.tar.gz
 
 fetch :
@@ -42,6 +42,8 @@ artifacts :
 
 check : README.md
 	@python3 assets/update-version.py
+	@wget -q -O source_release https://gitlab.com/librewolf-community/browser/source/-/raw/main/release
+	@echo ""
 	@echo "Current release:" $$(cat ./release)
 
 
diff --git a/assets/update-version.py b/assets/update-version.py
index 3736b10..ef57b49 100755
--- a/assets/update-version.py
+++ b/assets/update-version.py
@@ -83,10 +83,7 @@ def firefox_release_url(ver):
     return 'https://archive.mozilla.org/pub/firefox/releases/{}/source/firefox-{}.source.tar.xz'.format(ver, ver)
 
 def check_url_exists(url):
-    print('[debug] checking url: {}'.format(url))
-    #i = exec('wget --spider {} 2>/dev/null'.format(url), exit_on_fail=False)
-    i = exec('wget --spider {}'.format(url), exit_on_fail=False)
-    print('[debug] return value: {}'.format(i))
+    i = exec('wget --spider {} 2>/dev/null'.format(url), exit_on_fail=False)
     if i == 0:
         return True
     else:
diff --git a/mk.py b/mk.py
index 7e900e7..882b54d 100644
--- a/mk.py
+++ b/mk.py
@@ -68,20 +68,22 @@ def build(debug=False):
     
     with open('version','r') as file:
         version = file.read().rstrip()
-        os.chdir('librewolf-{}'.format(version))
+        with open('source_release','r') as file:
+            source_release = file.read().rstrip()
+            os.chdir('librewolf-{}-{}'.format(version,source_release))
 
-        # patches
-        if debug:
-            exec('cp -v ../assets/mozconfig.windows.debug mozconfig')
-        else:
-            exec('cp -v ../assets/mozconfig.windows mozconfig')
+            # patches
+            if debug:
+                exec('cp -v ../assets/mozconfig.windows.debug mozconfig')
+            else:
+                exec('cp -v ../assets/mozconfig.windows mozconfig')
             
-        patch('../assets/package-manifest.patch')
+                patch('../assets/package-manifest.patch')
 
-        # perform the build and package
-        exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build')
-        exec('MACH_USE_SYSTEM_PYTHON=1 ./mach package')
-        os.chdir('..')
+                # perform the build and package
+                exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build')
+                exec('MACH_USE_SYSTEM_PYTHON=1 ./mach package')
+                os.chdir('..')
 
 
 
@@ -99,7 +101,7 @@ def artifacts():
         buildzip_filename = 'firefox-{}-{}.en-US.win64.zip'.format(version,source_release)
         if _with_app_name:
             buildzip_filename = 'librewolf-{}-{}.en-US.win64.zip'.format(version,source_release)
-        exec('cp -v librewolf-{}/obj-x86_64-pc-mingw32/dist/{} .'.format(version,buildzip_filename))
+        exec('cp -v librewolf-{}-{}/obj-x86_64-pc-mingw32/dist/{} .'.format(version,source_release,buildzip_filename))
         exec('rm -rf work && mkdir work')
         os.chdir('work')
         exec('unzip ../{}'.format(buildzip_filename))
diff --git a/source_release b/source_release
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/source_release
@@ -0,0 +1 @@
+2
diff --git a/version b/version
index 9d8e80a..0dbb2d6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-96.0.3
\ No newline at end of file
+97.0
\ No newline at end of file