v97.0 (source release 2)
This commit is contained in:
parent
1e10e0ff63
commit
3cb41798c6
6 changed files with 21 additions and 20 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -20,4 +20,3 @@ build_tag
|
||||||
/docker/librewolf/mint20/deb/artifacts
|
/docker/librewolf/mint20/deb/artifacts
|
||||||
/docker/librewolf/ubuntu20/deb/artifacts
|
/docker/librewolf/ubuntu20/deb/artifacts
|
||||||
/docker/*.log
|
/docker/*.log
|
||||||
/source_release
|
|
||||||
|
|
|
||||||
6
Makefile
6
Makefile
|
|
@ -22,10 +22,10 @@ all : fetch build artifacts
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
rm -rf work
|
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
|
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
|
rm -f source_release librewolf-$(shell cat version)-*.source.tar.gz
|
||||||
|
|
||||||
fetch :
|
fetch :
|
||||||
|
|
@ -42,6 +42,8 @@ artifacts :
|
||||||
|
|
||||||
check : README.md
|
check : README.md
|
||||||
@python3 assets/update-version.py
|
@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)
|
@echo "Current release:" $$(cat ./release)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
return 'https://archive.mozilla.org/pub/firefox/releases/{}/source/firefox-{}.source.tar.xz'.format(ver, ver)
|
||||||
|
|
||||||
def check_url_exists(url):
|
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 {} 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))
|
|
||||||
if i == 0:
|
if i == 0:
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
26
mk.py
26
mk.py
|
|
@ -68,20 +68,22 @@ def build(debug=False):
|
||||||
|
|
||||||
with open('version','r') as file:
|
with open('version','r') as file:
|
||||||
version = file.read().rstrip()
|
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
|
# patches
|
||||||
if debug:
|
if debug:
|
||||||
exec('cp -v ../assets/mozconfig.windows.debug mozconfig')
|
exec('cp -v ../assets/mozconfig.windows.debug mozconfig')
|
||||||
else:
|
else:
|
||||||
exec('cp -v ../assets/mozconfig.windows mozconfig')
|
exec('cp -v ../assets/mozconfig.windows mozconfig')
|
||||||
|
|
||||||
patch('../assets/package-manifest.patch')
|
patch('../assets/package-manifest.patch')
|
||||||
|
|
||||||
# perform the build and package
|
# perform the build and package
|
||||||
exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build')
|
exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build')
|
||||||
exec('MACH_USE_SYSTEM_PYTHON=1 ./mach package')
|
exec('MACH_USE_SYSTEM_PYTHON=1 ./mach package')
|
||||||
os.chdir('..')
|
os.chdir('..')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -99,7 +101,7 @@ def artifacts():
|
||||||
buildzip_filename = 'firefox-{}-{}.en-US.win64.zip'.format(version,source_release)
|
buildzip_filename = 'firefox-{}-{}.en-US.win64.zip'.format(version,source_release)
|
||||||
if _with_app_name:
|
if _with_app_name:
|
||||||
buildzip_filename = 'librewolf-{}-{}.en-US.win64.zip'.format(version,source_release)
|
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')
|
exec('rm -rf work && mkdir work')
|
||||||
os.chdir('work')
|
os.chdir('work')
|
||||||
exec('unzip ../{}'.format(buildzip_filename))
|
exec('unzip ../{}'.format(buildzip_filename))
|
||||||
|
|
|
||||||
1
source_release
Normal file
1
source_release
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
2
|
||||||
2
version
2
version
|
|
@ -1 +1 @@
|
||||||
96.0.3
|
97.0
|
||||||
Loading…
Add table
Reference in a new issue