gitian: Parametrize target platforms

This commit is contained in:
Howard Chu 2019-11-10 12:25:13 +00:00 committed by wowario
parent c236474c4b
commit a01ad8b296
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111
1 changed files with 22 additions and 27 deletions

View File

@ -48,29 +48,28 @@ def rebuild():
print('\nBuilding Dependencies\n') print('\nBuilding Dependencies\n')
os.makedirs('../out/' + args.version, exist_ok=True) os.makedirs('../out/' + args.version, exist_ok=True)
if args.linux: platforms = {'l': ['Linux', 'linux', 'tar.bz2'],
print('\nCompiling ' + args.version + ' Linux') 'a': ['Android', 'android', 'tar.bz2'],
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, 'inputs/monero/contrib/gitian/gitian-linux.yml']) 'w': ['Windows', 'win', 'zip'],
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../sigs/', 'inputs/monero/contrib/gitian/gitian-linux.yml']) 'm': ['MacOS', 'osx', 'tar.bz2'] }
subprocess.check_call('mv build/out/monero-*.tar.bz2 ../out/'+args.version, shell=True)
if args.android: for i in args.os:
print('\nCompiling ' + args.version + ' Android') if i is 'm' and args.nomac:
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, 'inputs/monero/contrib/gitian/gitian-android.yml']) continue
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-android', '--destination', '../sigs/', 'inputs/monero/contrib/gitian/gitian-android.yml'])
subprocess.check_call('mv build/out/monero-*.tar.bz2 ../out/'+args.version, shell=True)
if args.windows: os_name = platforms[i][0]
print('\nCompiling ' + args.version + ' Windows') tag_name = platforms[i][1]
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, 'inputs/monero/contrib/gitian/gitian-win.yml']) suffix = platforms[i][2]
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win', '--destination', '../sigs/', 'inputs/monero/contrib/gitian/gitian-win.yml'])
subprocess.check_call('mv build/out/monero*.zip ../out/'+args.version, shell=True)
if args.macos: print('\nCompiling ' + args.version + ' ' + os_name)
print('\nCompiling ' + args.version + ' MacOS') infile = 'inputs/monero/contrib/gitian/gitian-' + tag_name + '.yml'
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero'+args.url, 'inputs/monero/contrib/gitian/gitian-osx.yml']) subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, infile])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../sigs/', 'inputs/monero/contrib/gitian/gitian-osx.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../sigs/', infile])
subprocess.check_call('mv build/out/monero*.tar.bz2 ../out/'+args.version, shell=True) subprocess.check_call('mv build/out/monero-*.' + suffix + ' ../out/'+args.version, shell=True)
print('Moving var/install.log to var/install-' + tag_name + '.log')
subprocess.check_call('mv var/install.log var/install-' + tag_name + '.log', shell=True)
print('Moving var/build.log to var/build-' + tag_name + '.log')
subprocess.check_call('mv var/build.log var/build-' + tag_name + '.log', shell=True)
os.chdir(workdir) os.chdir(workdir)
@ -142,11 +141,6 @@ def main():
args = parser.parse_args() args = parser.parse_args()
workdir = os.getcwd() workdir = os.getcwd()
args.linux = 'l' in args.os
args.android = 'a' in args.os
args.windows = 'w' in args.os
args.macos = 'm' in args.os
args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs']) args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
if args.buildsign: if args.buildsign:
@ -173,10 +167,11 @@ def main():
os.environ['LXC_GUEST_IP'] = '10.0.3.5' os.environ['LXC_GUEST_IP'] = '10.0.3.5'
# Disable MacOS build if no SDK found # Disable MacOS build if no SDK found
if args.macos and not os.path.isfile('builder/inputs/MacOSX10.11.sdk.tar.gz'): args.nomac = False
args.macos = False if 'm' in args.os and not os.path.isfile('builder/inputs/MacOSX10.11.sdk.tar.gz'):
if args.build: if args.build:
print('Cannot build for MacOS, SDK does not exist. Will build for other OSes') print('Cannot build for MacOS, SDK does not exist. Will build for other OSes')
args.nomac = True
script_name = os.path.basename(sys.argv[0]) script_name = os.path.basename(sys.argv[0])
# Signer and version shouldn't be empty # Signer and version shouldn't be empty