v94.0.2.3

This commit is contained in:
Bert van der Weerd 2021-11-23 13:05:14 +01:00
parent 43443adfbf
commit adf05892e4
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 10 additions and 8 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/.vs
/firefox-* /firefox-*
/librewolf /librewolf
/mozilla-unified /mozilla-unified

View file

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
pkgver = '94.0.2' pkgver = '94.0.2'
lwver = "{}.3".format(pkgver)
nightly_ver = '96.0a1' nightly_ver = '96.0a1'
# #
@ -421,7 +422,7 @@ def execute_lw_artifacts():
# create zip filename # create zip filename
if options.src == 'release': if options.src == 'release':
zipname = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg) zipname = "librewolf-{}.en-US.{}.zip".format(lwver,ospkg)
elif options.src == 'nightly': elif options.src == 'nightly':
zipname = "librewolf-{}.en-US.{}-nightly.zip".format(nightly_ver,ospkg) zipname = "librewolf-{}.en-US.{}-nightly.zip".format(nightly_ver,ospkg)
elif options.src == 'gecko-dev': elif options.src == 'gecko-dev':
@ -431,7 +432,7 @@ def execute_lw_artifacts():
if options.distro == 'win': if options.distro == 'win':
# we need tmp to tell us what portable folder to make # we need tmp to tell us what portable folder to make
if options.src == 'release': if options.src == 'release':
tmp = pkgver tmp = lwver
else: else:
tmp = nightly_ver tmp = nightly_ver
@ -455,7 +456,7 @@ def execute_lw_artifacts():
# create installer # create installer
if options.distro == 'win': if options.distro == 'win':
setupname = "librewolf-{}.en-US.win64-setup.exe".format(pkgver) setupname = "librewolf-{}.en-US.win64-setup.exe".format(lwver)
if options.src == 'nightly': if options.src == 'nightly':
if os.path.isfile(setupname): if os.path.isfile(setupname):
exec("rm -f tmp.exe") exec("rm -f tmp.exe")
@ -468,7 +469,7 @@ def execute_lw_artifacts():
setupname = "librewolf-{}.en-US.win64-gecko-dev-setup.exe".format(nightly_ver) setupname = "librewolf-{}.en-US.win64-gecko-dev-setup.exe".format(nightly_ver)
exec("rm -f {} tmp.nsi".format(setupname)) exec("rm -f {} tmp.nsi".format(setupname))
s = pkgver s = lwver
if options.src == 'nightly' or options.src == 'gecko-dev': if options.src == 'nightly' or options.src == 'gecko-dev':
s = nightly_ver s = nightly_ver
exec("sed \"s/pkg_version/{}/g\" < setup.nsi > tmp.nsi".format(s)) exec("sed \"s/pkg_version/{}/g\" < setup.nsi > tmp.nsi".format(s))
@ -478,7 +479,7 @@ def execute_lw_artifacts():
if from_name != setupname: if from_name != setupname:
exec("mv {} {}".format(from_name,setupname)) exec("mv {} {}".format(from_name,setupname))
if os.path.isfile("tmp.exe"): if os.path.isfile("tmp.exe"):
exec("mv tmp.exe librewolf-{}.en-US.win64-setup.exe".format(pkgver)) exec("mv tmp.exe librewolf-{}.en-US.win64-setup.exe".format(lwver))
def do_upload(filename): def do_upload(filename):
exec("echo \".\" >> upload.txt") exec("echo \".\" >> upload.txt")
@ -500,8 +501,8 @@ def execute_upload():
ospkg = "osx" ospkg = "osx"
zip_filename = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg) zip_filename = "librewolf-{}.en-US.{}.zip".format(lwver,ospkg)
setup_filename = "librewolf-{}.en-US.{}-setup.exe".format(pkgver,ospkg) setup_filename = "librewolf-{}.en-US.{}-setup.exe".format(lwver,ospkg)
# nightly_setup_filename = "librewolf-{}.en-US.{}-gecko-dev.zip".format(nightly_ver,ospkg) # nightly_setup_filename = "librewolf-{}.en-US.{}-gecko-dev.zip".format(nightly_ver,ospkg)
if not os.path.isfile(zip_filename): if not os.path.isfile(zip_filename):
@ -543,7 +544,7 @@ def execute_all():
execute_lw_artifacts() execute_lw_artifacts()
def execute_clean(): def execute_clean():
exec("rm -rf librewolf-{} librewolf-{}".format(pkgver,nightly_ver)) exec("rm -rf librewolf-{} librewolf-{} librewolf-{}".format(pkgver,nightly_ver,lwver))
exec("rm -rf librewolf bootstrap.py tmp.nsi tmp.exe sha256sums.txt upload.txt librewolf-portable.exe") exec("rm -rf librewolf bootstrap.py tmp.nsi tmp.exe sha256sums.txt upload.txt librewolf-portable.exe")
for filename in glob.glob("librewolf-*"): for filename in glob.glob("librewolf-*"):
try: try: