mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More PEP8 compliance (build.py, partial)

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-04-30 23:23:57 +01:00
parent bd34fc2530
commit 2f6ce712f5
1 changed files with 61 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

67
fdroidserver/build.py
View file

@ -31,14 +31,17 @@ from ConfigParser import ConfigParser
from optparse import OptionParser, OptionError from optparse import OptionParser, OptionError
import logging import logging
import common, metadata import common
import metadata
from common import BuildException, VCSException, FDroidPopen, SilentPopen from common import BuildException, VCSException, FDroidPopen, SilentPopen
def get_builder_vm_id(): def get_builder_vm_id():
vd = os.path.join('builder', '.vagrant') vd = os.path.join('builder', '.vagrant')
if os.path.isdir(vd): if os.path.isdir(vd):
# Vagrant 1.2 (and maybe 1.1?) it's a directory tree... # Vagrant 1.2 (and maybe 1.1?) it's a directory tree...
with open(os.path.join(vd, 'machines', 'default', 'virtualbox', 'id')) as vf: with open(os.path.join(vd, 'machines', 'default',
'virtualbox', 'id')) as vf:
id = vf.read() id = vf.read()
return id return id
else: else:
@ -47,6 +50,7 @@ def get_builder_vm_id():
v = json.load(vf) v = json.load(vf)
return v['active']['default'] return v['active']['default']
def got_valid_builder_vm(): def got_valid_builder_vm():
"""Returns True if we have a valid-looking builder vm """Returns True if we have a valid-looking builder vm
""" """
@ -59,7 +63,8 @@ def got_valid_builder_vm():
# Vagrant 1.0 - if the directory is there, it's valid... # Vagrant 1.0 - if the directory is there, it's valid...
return True return True
# Vagrant 1.2 - the directory can exist, but the id can be missing... # Vagrant 1.2 - the directory can exist, but the id can be missing...
if not os.path.exists(os.path.join(vd, 'machines', 'default', 'virtualbox', 'id')): if not os.path.exists(os.path.join(vd, 'machines', 'default',
'virtualbox', 'id')):
return False return False
return True return True
@ -93,9 +98,12 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
if got_valid_builder_vm(): if got_valid_builder_vm():
logging.info("...VM is present") logging.info("...VM is present")
p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'], cwd='builder') p = FDroidPopen(['VBoxManage', 'snapshot',
get_builder_vm_id(), 'list',
'--details'], cwd='builder')
if 'fdroidclean' in p.stdout: if 'fdroidclean' in p.stdout:
logging.info("...snapshot exists - resetting build server to clean state") logging.info("...snapshot exists - resetting build server to "
"clean state")
retcode, output = vagrant(['status'], cwd='builder') retcode, output = vagrant(['status'], cwd='builder')
if 'running' in output: if 'running' in output:
@ -103,7 +111,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
vagrant(['suspend'], cwd='builder') vagrant(['suspend'], cwd='builder')
logging.info("...waiting a sec...") logging.info("...waiting a sec...")
time.sleep(10) time.sleep(10)
p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'restore', 'fdroidclean'], p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
'restore', 'fdroidclean'],
cwd='builder') cwd='builder')
if p.returncode == 0: if p.returncode == 0:
@ -117,7 +126,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
else: else:
logging.info("...failed to reset to snapshot") logging.info("...failed to reset to snapshot")
else: else:
logging.info("...snapshot doesn't exist - VBoxManage snapshot list:\n" + p.stdout) logging.info("...snapshot doesn't exist - "
"VBoxManage snapshot list:\n" + p.stdout)
# If we can't use the existing machine for any reason, make a # If we can't use the existing machine for any reason, make a
# new one from scratch. # new one from scratch.
@ -128,7 +138,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
shutil.rmtree('builder') shutil.rmtree('builder')
os.mkdir('builder') os.mkdir('builder')
p = subprocess.Popen('vagrant --version', shell=True, stdout=subprocess.PIPE) p = subprocess.Popen('vagrant --version', shell=True,
stdout=subprocess.PIPE)
vver = p.communicate()[0] vver = p.communicate()[0]
if vver.startswith('Vagrant version 1.2'): if vver.startswith('Vagrant version 1.2'):
with open('builder/Vagrantfile', 'w') as vf: with open('builder/Vagrantfile', 'w') as vf:
@ -165,7 +176,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
elif idfile.startswith('"') and idfile.endswith('"'): elif idfile.startswith('"') and idfile.endswith('"'):
idfile = idfile[1:-1] idfile = idfile[1:-1]
sshs.connect(sshconfig['hostname'], username=sshconfig['user'], sshs.connect(sshconfig['hostname'], username=sshconfig['user'],
port=int(sshconfig['port']), timeout=300, look_for_keys=False, port=int(sshconfig['port']), timeout=300,
look_for_keys=False,
key_filename=idfile) key_filename=idfile)
sshs.close() sshs.close()
@ -175,7 +187,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
raise BuildException("Failed to suspend build server") raise BuildException("Failed to suspend build server")
logging.info("...waiting a sec...") logging.info("...waiting a sec...")
time.sleep(10) time.sleep(10)
p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'take', 'fdroidclean'], p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
'take', 'fdroidclean'],
cwd='builder') cwd='builder')
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to take snapshot") raise BuildException("Failed to take snapshot")
@ -188,7 +201,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
logging.info("...waiting a sec...") logging.info("...waiting a sec...")
time.sleep(10) time.sleep(10)
# Make sure it worked... # Make sure it worked...
p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'], p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
'list', '--details'],
cwd='builder') cwd='builder')
if 'fdroidclean' not in p.stdout: if 'fdroidclean' not in p.stdout:
raise BuildException("Failed to take snapshot.") raise BuildException("Failed to take snapshot.")
@ -216,8 +230,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
if idfile.startswith('"') and idfile.endswith('"'): if idfile.startswith('"') and idfile.endswith('"'):
idfile = idfile[1:-1] idfile = idfile[1:-1]
sshs.connect(sshconfig['hostname'], username=sshconfig['user'], sshs.connect(sshconfig['hostname'], username=sshconfig['user'],
port=int(sshconfig['port']), timeout=300, look_for_keys=False, port=int(sshconfig['port']), timeout=300,
key_filename=idfile) look_for_keys=False, key_filename=idfile)
# Get an SFTP connection... # Get an SFTP connection...
ftp = sshs.open_sftp() ftp = sshs.open_sftp()
@ -296,7 +310,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
srclibpaths = [] srclibpaths = []
if 'srclibs' in thisbuild: if 'srclibs' in thisbuild:
for lib in thisbuild['srclibs']: for lib in thisbuild['srclibs']:
srclibpaths.append(common.getsrclib(lib, 'build/srclib', srclibpaths, srclibpaths.append(
common.getsrclib(lib, 'build/srclib', srclibpaths,
basepath=True, prepare=False)) basepath=True, prepare=False))
# If one was used for the main source, add that too. # If one was used for the main source, add that too.
@ -355,8 +370,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
ftp.chdir('/home/vagrant/tmp') ftp.chdir('/home/vagrant/tmp')
else: else:
ftp.chdir('/home/vagrant/unsigned') ftp.chdir('/home/vagrant/unsigned')
apkfile = common.getapkname(app,thisbuild) apkfile = common.getapkname(app, thisbuild)
tarball = common.getsrcname(app,thisbuild) tarball = common.getsrcname(app, thisbuild)
try: try:
ftp.get(apkfile, os.path.join(output_dir, apkfile)) ftp.get(apkfile, os.path.join(output_dir, apkfile))
if not options.notarball: if not options.notarball:
@ -371,6 +386,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
logging.info("Suspending build server") logging.info("Suspending build server")
subprocess.call(['vagrant', 'suspend'], cwd='builder') subprocess.call(['vagrant', 'suspend'], cwd='builder')
def adapt_gradle(build_dir): def adapt_gradle(build_dir):
for root, dirs, files in os.walk(build_dir): for root, dirs, files in os.walk(build_dir):
if 'build.gradle' in files: if 'build.gradle' in files:
@ -463,8 +479,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if not options.notarball: if not options.notarball:
# Build the source tarball right before we build the release... # Build the source tarball right before we build the release...
logging.info("Creating source tarball...") logging.info("Creating source tarball...")
tarname = common.getsrcname(app,thisbuild) tarname = common.getsrcname(app, thisbuild)
tarball = tarfile.open(os.path.join(tmp_dir, tarname), "w:gz") tarball = tarfile.open(os.path.join(tmp_dir, tarname), "w:gz")
def tarexc(f): def tarexc(f):
return any(f.endswith(s) for s in ['.svn', '.git', '.hg', '.bzr']) return any(f.endswith(s) for s in ['.svn', '.git', '.hg', '.bzr'])
tarball.add(build_dir, tarname, exclude=tarexc) tarball.add(build_dir, tarname, exclude=tarexc)
@ -507,7 +524,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
jni_components = thisbuild.get('buildjni') jni_components = thisbuild.get('buildjni')
if jni_components == ['yes']: if jni_components == ['yes']:
jni_components = [''] jni_components = ['']
cmd = [ os.path.join(config['ndk_path'], "ndk-build"), "-j1" ] cmd = [os.path.join(config['ndk_path'], "ndk-build"), "-j1"]
for d in jni_components: for d in jni_components:
if d: if d:
logging.info("Building native code in '%s'" % d) logging.info("Building native code in '%s'" % d)
@ -524,7 +541,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
open(manifest, 'w').write(manifest_text) open(manifest, 'w').write(manifest_text)
# In case the AM.xml read was big, free the memory # In case the AM.xml read was big, free the memory
del manifest_text del manifest_text
p = FDroidPopen(cmd, cwd=os.path.join(root_dir,d)) p = FDroidPopen(cmd, cwd=os.path.join(root_dir, d))
if p.returncode != 0: if p.returncode != 0:
raise BuildException("NDK build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout) raise BuildException("NDK build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
@ -534,7 +551,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
logging.info("Building Maven project...") logging.info("Building Maven project...")
if '@' in thisbuild['maven']: if '@' in thisbuild['maven']:
maven_dir = os.path.join(root_dir, thisbuild['maven'].split('@',1)[1]) maven_dir = os.path.join(root_dir, thisbuild['maven'].split('@', 1)[1])
else: else:
maven_dir = root_dir maven_dir = root_dir
@ -603,7 +620,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
'--name', bconfig.get('app', 'title'), '--name', bconfig.get('app', 'title'),
'--package', app['id'], '--package', app['id'],
'--version', bconfig.get('app', 'version'), '--version', bconfig.get('app', 'version'),
'--orientation', orientation, '--orientation', orientation
] ]
perms = bconfig.get('app', 'permissions') perms = bconfig.get('app', 'permissions')
@ -769,7 +786,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
# Copy the unsigned apk to our destination directory for further # Copy the unsigned apk to our destination directory for further
# processing (by publish.py)... # processing (by publish.py)...
dest = os.path.join(output_dir, common.getapkname(app,thisbuild)) dest = os.path.join(output_dir, common.getapkname(app, thisbuild))
shutil.copyfile(src, dest) shutil.copyfile(src, dest)
# Move the source tarball into the output directory... # Move the source tarball into the output directory...
@ -871,6 +888,7 @@ def parse_commandline():
options = None options = None
config = None config = None
def main(): def main():
global options, config global options, config
@ -933,7 +951,7 @@ def main():
for build in reversed(app['builds']): for build in reversed(app['builds']):
if 'disable' in build: if 'disable' in build:
continue continue
app['builds'] = [ build ] app['builds'] = [build]
break break
if options.wiki: if options.wiki:
@ -979,7 +997,7 @@ def main():
logfile = open(os.path.join(log_dir, app['id'] + '.log'), 'a+') logfile = open(os.path.join(log_dir, app['id'] + '.log'), 'a+')
logfile.write(str(be)) logfile.write(str(be))
logfile.close() logfile.close()
reason = str(be).split('\n',1)[0] if options.verbose else str(be) reason = str(be).split('\n', 1)[0] if options.verbose else str(be)
print("Could not build app %s due to BuildException: %s" % ( print("Could not build app %s due to BuildException: %s" % (
app['id'], reason)) app['id'], reason))
if options.stop: if options.stop:
@ -1024,4 +1042,3 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
main() main()