From 0cd22f9d3b7f985247a82d313e60b669eee3d86c Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 1 Apr 2022 18:03:50 +0200 Subject: [PATCH] mk.py-commit --- Makefile | 2 +- assets/mozconfig.windows | 2 +- mk.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2ad5c5f..ce4379b 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ clean : rm -rf work veryclean : clean - 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 firefox-$(shell cat version)*.en-US.win64.installer.exe rm -rf librewolf-$(shell cat version)-$(shell cat source_release) rm -f librewolf-$(shell cat version)-*.source.tar.gz* diff --git a/assets/mozconfig.windows b/assets/mozconfig.windows index 17045d5..8134e05 100644 --- a/assets/mozconfig.windows +++ b/assets/mozconfig.windows @@ -11,7 +11,7 @@ ac_add_options --enable-optimize ac_add_options --enable-release ac_add_options --enable-rust-simd -#ac_add_options --with-app-name=librewolf +ac_add_options --with-app-name=firefox ac_add_options --with-branding=browser/branding/librewolf ac_add_options --with-unsigned-addon-scopes=app,system diff --git a/mk.py b/mk.py index cb3b371..aebb547 100644 --- a/mk.py +++ b/mk.py @@ -1,4 +1,4 @@ - #!/usr/bin/env python3 +#!/usr/bin/env python3 import os,sys,subprocess,os.path @@ -64,7 +64,7 @@ def fetch(): exec('wget -q -O version https://gitlab.com/librewolf-community/browser/source/-/raw/main/version') exec('wget -q -O source_release https://gitlab.com/librewolf-community/browser/source/-/raw/main/release') exec('wget -q -O librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum?job=Build') - exec('wget -O librewolf-$(cat version)-$(cat source_release).source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$(cat version)-$(cat source_release).source.tar.gz?job=Build') + exec('wget -q -O librewolf-$(cat version)-$(cat source_release).source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$(cat version)-$(cat source_release).source.tar.gz?job=Build') exec('sha256sum -c librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum') exec('cat librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum') @@ -111,6 +111,7 @@ def artifacts(): 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,source_release,buildzip_filename)) + exec('cp -v librewolf-{}-{}/obj-x86_64-pc-mingw32/dist/install/sea/firefox-{}-{}.en-US.win64.installer.exe .'.format(version,source_release,version,source_release)) exec('rm -rf work && mkdir work') os.chdir('work') exec('unzip -q ../{}'.format(buildzip_filename))