Sat 30 Jul 2022 08:35:21 PM CEST

This commit is contained in:
Bert van der Weerd 2022-07-30 20:35:21 +02:00
parent 48b0e79d5b
commit 7d208db7c4
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
4 changed files with 10 additions and 8 deletions

View file

@ -40,4 +40,4 @@ ac_add_options --enable-strip
#ac_add_options --disable-verify-mar #ac_add_options --disable-verify-mar
# Internationalization # Internationalization
ac_add_options --with-l10n-base=$PWD/browser/locales/l10n ac_add_options --with-l10n-base=c:/mozilla-source/librewolf/windows/librewolf-103.0-3/browser/locales/l10n

View file

@ -1,6 +1,6 @@
import os,sys,subprocess,os.path import os,sys,subprocess,os.path
bash_loc = 'c:/mozilla-build/msys/bin/bash.exe' bash_loc = 'c:/mozilla-build/msys2/usr/bin/bash.exe'
do_zip = False do_zip = False
# native()/bash()/exec() utility functions # native()/bash()/exec() utility functions

12
mk.py
View file

@ -97,9 +97,10 @@ def build(debug=False):
# patches for windows only # patches for windows only
patch('../assets/package-manifest.patch') patch('../assets/package-manifest.patch')
#patch('../assets/disable-verify-mar.patch')
patch('../assets/tryfix-reslink-fail.patch') patch('../assets/tryfix-reslink-fail.patch')
patch('../assets/fix-l10n-package-cmd.patch')
# patch('../assets/disable-verify-mar.patch')
# patch('../assets/fix-l10n-package-cmd.patch')
# perform the build and package. # perform the build and package.
exec('./mach build') exec('./mach build')
@ -164,13 +165,14 @@ def artifacts():
# With that out of the way, we need to create the main 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") # suspect?
exec("( cd x86-ansi ; unzip ../../assets/nsProcess.zip )")
exec("wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe") exec("wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe")
setupname = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version) setupname = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version)
exec('sed \"s/pkg_version/{}/g\" < ../assets/setup.nsi > tmp.nsi'.format(full_version)) exec('sed \"s/pkg_version/{}/g\" < ../assets/setup.nsi > tmp.nsi'.format(full_version))
exec('cp -v ../assets/librewolf.ico .') exec('cp -v ../assets/librewolf.ico .')
exec('cp -v ../assets/banner.bmp .') exec('cp -v ../assets/banner.bmp .')
exec('makensis-3.01.exe -V1 tmp.nsi') exec('~/.mozbuild/nsis/makensis.exe -V1 tmp.nsi')
exec('rm -rf tmp.nsi librewolf.ico banner.bmp x86-ansi') exec('rm -rf tmp.nsi librewolf.ico banner.bmp x86-ansi')
exec("mv {} ..".format(setupname)) exec("mv {} ..".format(setupname))
os.chdir('..') os.chdir('..')
@ -183,7 +185,7 @@ def artifacts():
os.makedirs('librewolf-{}/LibreWolf'.format(version), exist_ok=True) os.makedirs('librewolf-{}/LibreWolf'.format(version), exist_ok=True)
exec('cp -r librewolf/* librewolf-{}/LibreWolf'.format(version)) exec('cp -r librewolf/* librewolf-{}/LibreWolf'.format(version))
# on gitlab: https://gitlab.com/ltGuillaume # on gitlab: https://gitlab.com/ltGuillaume
exec('git clone https://github.com/ltGuillaume/LibreWolf-Portable') exec('"/c/Program Files/Git/bin/git.exe" clone https://github.com/ltGuillaume/LibreWolf-Portable')
exec('cp -v LibreWolf-Portable/LibreWolf-Portable.* LibreWolf-Portable/*.exe librewolf-{}/'.format(version)) exec('cp -v LibreWolf-Portable/LibreWolf-Portable.* LibreWolf-Portable/*.exe librewolf-{}/'.format(version))
os.chdir('librewolf-{}'.format(version)) os.chdir('librewolf-{}'.format(version))
# installed from: https://www.autohotkey.com/ # installed from: https://www.autohotkey.com/

View file

@ -1 +1 @@
2 3