librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try autodetecting --distro parameter

Browse source
This commit is contained in:
Bert van der Weerd 2021-06-30 10:31:06 +02:00
parent 65dc7d8060
commit a9341594ad
No known key found for this signature in database
GPG key ID: 86F10BA7EFE4A7C1
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
build.py
View file

@ -7,12 +7,14 @@ nightly_ver = '91.0a1'
# build.py - try move functionality away from that too big/horrible build script. # build.py - try move functionality away from that too big/horrible build script.
# #
import optparse import optparse
import sys import sys
import os import os
import glob import glob
import time import time
start_time = time.time() start_time = time.time()
parser = optparse.OptionParser() parser = optparse.OptionParser()
@ -20,11 +22,30 @@ parser.add_option('-x', '--cross', dest='cross_compile', default=False,
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")
parser.add_option('-l', '--no-librewolf', dest='no_librewolf', default=False, action="store_true") parser.add_option('-l', '--no-librewolf', dest='no_librewolf', default=False, action="store_true")
parser.add_option('-s', '--src', dest='src', default='release') parser.add_option('-s', '--src', dest='src', default='release')
parser.add_option('-t', '--distro', dest='distro', default='win') parser.add_option('-t', '--distro', dest='distro', default='autodetect')
parser.add_option('-T', '--token', dest='token', default='') parser.add_option('-T', '--token', dest='token', default='')
options, remainder = parser.parse_args() options, remainder = parser.parse_args()
# try autodetecting options.distro
if options.distro == 'autodetect':
options.distro = 'win'
if os.path.isdir('/Applications'):
options.distro = 'osx'
elif os.path.isdir('/etc'):
options.distro = 'rpm'
if os.path.isdir('/etc/apt'):
options.distro = 'deb'
print('[debug]: autoselected --distro {}'.format(options.distro))
def script_exit(statuscode): def script_exit(statuscode):
if (time.time() - start_time) > 60: if (time.time() - start_time) > 60:
# print elapsed time # print elapsed time
@ -388,8 +409,8 @@ def execute_upload():
zip_filename = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg) zip_filename = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg)
setup_filename = "librewolf-{}.en-US.win64-setup.exe".format(pkgver) setup_filename = "librewolf-{}.en-US.{}-setup.exe".format(pkgver,ospkg)
nightly_setup_filename = "librewolf-{}.en-US.win64-nightly-setup.exe".format(nightly_ver) nightly_setup_filename = "librewolf-{}.en-US.{}-nightly-setup.exe".format(nightly_ver,ospkg)
if not os.path.isfile(zip_filename): if not os.path.isfile(zip_filename):
print("fatal error: File '{}' not found.".format(zip_filename)) print("fatal error: File '{}' not found.".format(zip_filename))
@ -407,12 +428,18 @@ def execute_upload():
do_upload(zip_filename) do_upload(zip_filename)
do_upload(nightly_setup_filename) do_upload(nightly_setup_filename)
do_upload("sha256sums.txt") do_upload("sha256sums.txt")
print("upload.txt: Upload JSON api results are in the file \'upload.txt\'.")
# #
# Main targets: # Main targets:
# #
def execute_all(): def execute_all():
execute_fetch() execute_fetch()
execute_extract() execute_extract()