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

This commit is contained in:
Bert van der Weerd 2022-04-01 18:04:05 +02:00
commit eb4a264fd8
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 52 additions and 48 deletions

50
mk.py
View file

@ -2,54 +2,8 @@
import os,sys,subprocess,os.path
bash_loc = 'c:/mozilla-build/msys/bin/bash.exe'
do_zip = False
# native()/bash()/exec() utility functions
def native(cmd,do_print=True):
sys.stdout.flush()
if do_print:
print(cmd)
sys.stdout.flush()
retval = os.system(cmd)
if retval != 0:
sys.exit(retval)
def bash(cmd,do_print=True):
tmp = []
tmp += [bash_loc, '-c', cmd]
sys.stdout.flush()
if do_print:
print(cmd)
sys.stdout.flush()
retval = subprocess.run(tmp).returncode
if retval != 0:
sys.exit(retval)
def exec(cmd,do_print=True):
_native = False
if not os.path.isfile(bash_loc):
_native = True
if _native:
return native(cmd,do_print)
return bash(cmd,do_print)
def patch(patchfile):
cmd = "patch -p1 -i {}".format(patchfile)
sys.stdout.flush()
print("\n*** -> {}".format(cmd))
sys.stdout.flush()
retval = os.system(cmd)
if retval != 0:
sys.stdout.flush()
print("fatal error: patch '{}' failed".format(patchfile))
sys.stdout.flush()
sys.exit(retval)
import tools
from tools import exec, patch
#
# main functions

50
tools.py Normal file
View file

@ -0,0 +1,50 @@
import os,sys,subprocess,os.path
bash_loc = 'd:/mozilla-build/msys/bin/bash.exe'
do_zip = False
# native()/bash()/exec() utility functions
def native(cmd,do_print=True):
sys.stdout.flush()
if do_print:
print(cmd)
sys.stdout.flush()
retval = os.system(cmd)
if retval != 0:
sys.exit(retval)
def bash(cmd,do_print=True):
tmp = []
tmp += [bash_loc, '-c', cmd]
sys.stdout.flush()
if do_print:
print(cmd)
sys.stdout.flush()
retval = subprocess.run(tmp).returncode
if retval != 0:
sys.exit(retval)
def exec(cmd,do_print=True):
_native = False
if not os.path.isfile(bash_loc):
_native = True
if _native:
return native(cmd,do_print)
return bash(cmd,do_print)
def patch(patchfile):
cmd = "patch -p1 -i {}".format(patchfile)
sys.stdout.flush()
print("\n*** -> {}".format(cmd))
sys.stdout.flush()
retval = os.system(cmd)
if retval != 0:
sys.stdout.flush()
print("fatal error: patch '{}' failed".format(patchfile))
sys.stdout.flush()
sys.exit(retval)