First version of PortableApps zip file

This commit is contained in:
Bert van der Weerd 2022-02-27 14:58:59 +01:00
parent cca6c0dcfb
commit 3aaeadc20b
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 32 additions and 5 deletions

View file

@ -10,7 +10,7 @@ parser = optparse.OptionParser()
parser.add_option('-n', '--no-execute', dest='no_execute', default=False, action="store_true") parser.add_option('-n', '--no-execute', dest='no_execute', default=False, action="store_true")
options, remainder = parser.parse_args() options, remainder = parser.parse_args()
bash_loc = 'd:/mozilla-build/msys/bin/bash.exe'
# native()/bash()/exec() utility functions # native()/bash()/exec() utility functions
def native(cmd,exit_on_fail = True,do_print=True): def native(cmd,exit_on_fail = True,do_print=True):
@ -26,7 +26,7 @@ def native(cmd,exit_on_fail = True,do_print=True):
def bash(cmd,exit_on_fail = True,do_print=True): def bash(cmd,exit_on_fail = True,do_print=True):
tmp = [] tmp = []
tmp += ['d:/mozilla-build/msys/bin/bash.exe', '-c', cmd] tmp += [bash_loc, '-c', cmd]
sys.stdout.flush() sys.stdout.flush()
if do_print: if do_print:
print(cmd) print(cmd)
@ -39,7 +39,7 @@ def bash(cmd,exit_on_fail = True,do_print=True):
def exec(cmd,exit_on_fail = True, do_print=True): def exec(cmd,exit_on_fail = True, do_print=True):
_native = False _native = False
if not os.path.isfile('d:/mozilla-build/msys/bin/bash.exe'): if not os.path.isfile(bash_lcc):
_native = True _native = True
if _native: if _native:
return native(cmd,exit_on_fail,do_print) return native(cmd,exit_on_fail,do_print)

31
mk.py
View file

@ -138,7 +138,7 @@ def artifacts():
exec("zip -qr9 ../{} librewolf-{}".format(zipname,version)) exec("zip -qr9 ../{} librewolf-{}".format(zipname,version))
os.chdir('..') os.chdir('..')
# With that out of the way, we need to create the nsis setup. # With that out of the way, we need to create the main nsis setup.
os.chdir('work') os.chdir('work')
exec("mkdir x86-ansi") exec("mkdir x86-ansi")
exec("wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll") exec("wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll")
@ -151,6 +151,31 @@ def artifacts():
exec("mv {} ..".format(setupname)) exec("mv {} ..".format(setupname))
os.chdir('..') os.chdir('..')
# Latest addition: PortableApps.com
os.chdir('work')
exec('rm -rf librewolf-{}'.format(version))
os.makedirs('librewolf-{}/Profiles/Default'.format(version), exist_ok=True)
os.makedirs('librewolf-{}/LibreWolf'.format(version), exist_ok=True)
exec('cp -vr librewolf/* librewolf-{}/LibreWolf'.format(version))
# on gitlab: https://gitlab.com/ltGuillaume
exec('git clone https://github.com/ltGuillaume/LibreWolf-Portable')
exec('cp -v LibreWolf-Portable/LibreWolf-Portable.* librewolf-{}/'.format(version))
exec('cp -v LibreWolf-Portable/*.exe librewolf-{}/'.format(version))
os.chdir('librewolf-{}'.format(version))
# installed from: https://www.autohotkey.com/
exec('"c:/Program Files/AutoHotkey/Compiler/Ahk2Exe.exe" /in LibreWolf-Portable.ahk /icon LibreWolf-Portable.ico')
# let's remove the ahk and icon to make things clearer for the users on what to click.
exec('rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico')
os.chdir('..')
pa_zipname = 'librewolf-{}.en-US.win64.PortableApps.zip'.format(full_version)
exec("rm -f ../{}".format(pa_zipname))
exec("zip -qr9 ../{} librewolf-{}".format(pa_zipname,version))
os.chdir('..')
# Utility function to upload() function. # Utility function to upload() function.
@ -174,10 +199,12 @@ def upload(token):
# Files we need to upload.. # Files we need to upload..
zip_filename = 'librewolf-{}.en-US.win64.zip'.format(full_version) zip_filename = 'librewolf-{}.en-US.win64.zip'.format(full_version)
setup_filename = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version) setup_filename = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version)
exec('sha256sum {} {} > sha256sums.txt'.format(setup_filename,zip_filename)) pazip_filename = 'librewolf-{}.en-US.win64.PortableApps.zip'.format(full_version)
exec('sha256sum {} {} {} > sha256sums.txt'.format(setup_filename,zip_filename,pazip_filename))
exec('rm -f upload.txt') exec('rm -f upload.txt')
do_upload(setup_filename,token) do_upload(setup_filename,token)
do_upload(zip_filename,token) do_upload(zip_filename,token)
do_upload(pazip_filename,token)
do_upload('sha256sums.txt',token) do_upload('sha256sums.txt',token)