Merge branch 'master' of gitlab.com:librewolf-community/browser/windows

This commit is contained in:
Bert van der Weerd 2022-01-15 10:13:47 +01:00
commit 0ffb0ad651
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
4 changed files with 20 additions and 11 deletions

View file

@ -21,7 +21,7 @@ all : fetch build artifacts
clean :
rm -rf work
rm -f librewolf-$(shell cat version).*.en-US.win64* md5sums.txt upload.txt firefox-$(shell cat version).en-US.win64.zip
rm -f librewolf-$(shell cat version)*.en-US.win64* md5sums.txt upload.txt firefox-$(shell cat version).en-US.win64.zip
veryclean : clean
rm -rf librewolf-$(shell cat version)

View file

@ -11,17 +11,16 @@ 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=librewolf
ac_add_options --with-branding=browser/branding/librewolf
#ac_add_options --with-distribution-id=io.gitlab.librewolf-community
ac_add_options --with-unsigned-addon-scopes=app,system
# see issue # https://gitlab.com/librewolf-community/browser/arch/-/issues/49
export MOZ_REQUIRE_SIGNING=
mk_add_options MOZ_CRASHREPORTER=0
mk_add_options MOZ_DATA_REPORTING=0
mk_add_options MOZ_NORMANTY=0
mk_add_options MOZ_REQUIRE_SIGNING=
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
mk_add_options MOZ_TELEMETRY_REPORTING=0
@ -33,3 +32,6 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
ac_add_options --disable-updater
ac_add_options --disable-maintenance-service
ac_add_options --enable-strip
ac_add_options --enable-default-toolkit=cairo-windows

View file

@ -65,6 +65,7 @@ Section "${PROGNAME}"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationName" "LibreWolf"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".htm" "LibreWolfHTM"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".html" "LibreWolfHTM"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".pdf" "LibreWolfHTM"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\Startmenu" "StartMenuInternet" "LibreWolf"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "http" "LibreWolfHTM"
WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "https" "LibreWolfHTM"
@ -79,8 +80,8 @@ Section "${PROGNAME}"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "AppUserModelId" "LibreWolf"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationIcon" "$INSTDIR\librewolf.exe,0"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationName" "LibreWolf"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationDescription" "Howling to Freedom"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationCompany" "LibreWolf"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationDescription" "Start the LibreWolf Browser"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationCompany" "LibreWolf Community"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\DefaultIcon" "" "$INSTDIR\librewolf.exe,0"
WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$INSTDIR\librewolf.exe %1"

14
mk.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
import os,sys,subprocess
import os,sys,subprocess,os.path
# native()/bash()/exec() utility functions
def native(cmd,do_print=True):
@ -27,7 +27,7 @@ def bash(cmd,do_print=True):
def exec(cmd,do_print=True):
_native = False
if not os.path.isFile('c:/mozilla-build/msys/bin/bash.exe'):
if not os.path.isfile('c:/mozilla-build/msys/bin/bash.exe'):
_native = True
if _native:
return native(cmd,do_print)
@ -82,17 +82,23 @@ def build():
def artifacts():
_with_app_name = True # Trying to fix issue #146 -> https://gitlab.com/librewolf-community/browser/windows/-/issues/146
with open('version','r') as file1:
version = file1.read().rstrip()
buildzip_filename = 'firefox-{}.en-US.win64.zip'.format(version)
if _with_app_name:
buildzip_filename = 'librewolf-{}.en-US.win64.zip'.format(version)
exec('cp -v librewolf-{}/obj-x86_64-pc-mingw32/dist/{} .'.format(version,buildzip_filename))
exec('rm -rf work && mkdir work')
os.chdir('work')
exec('unzip ../{}'.format(buildzip_filename))
exec('mv firefox librewolf')
if not _with_app_name:
exec('mv firefox librewolf')
os.chdir('librewolf')
exec('mv firefox.exe librewolf.exe')
if not _with_app_name:
exec('mv firefox.exe librewolf.exe')
os.chdir('..')
os.chdir('..')