import tarfile
import traceback
import time
-import json
import requests
import tempfile
from configparser import ConfigParser
from . import net
from . import metadata
from . import scanner
-from .common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
+from . import vmtools
+from .common import FDroidPopen, SdkToolsPopen
+from .exception import FDroidException, BuildException, VCSException
try:
import paramiko
pass
-def get_builder_vm_id():
- vd = os.path.join('builder', '.vagrant')
- if os.path.isdir(vd):
- # Vagrant 1.2 (and maybe 1.1?) it's a directory tree...
- with open(os.path.join(vd, 'machines', 'default',
- 'virtualbox', 'id')) as vf:
- id = vf.read()
- return id
- else:
- # Vagrant 1.0 - it's a json file...
- with open(os.path.join('builder', '.vagrant')) as vf:
- v = json.load(vf)
- return v['active']['default']
-
-
-def got_valid_builder_vm():
- """Returns True if we have a valid-looking builder vm
- """
- if not os.path.exists(os.path.join('builder', 'Vagrantfile')):
- return False
- vd = os.path.join('builder', '.vagrant')
- if not os.path.exists(vd):
- return False
- if not os.path.isdir(vd):
- # Vagrant 1.0 - if the directory is there, it's valid...
- return True
- # 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')):
- return False
- return True
-
-
-def vagrant(params, cwd=None, printout=False):
- """Run a vagrant command.
-
- :param: list of parameters to pass to vagrant
- :cwd: directory to run in, or None for current directory
- :returns: (ret, out) where ret is the return code, and out
- is the stdout (and stderr) from vagrant
- """
- p = FDroidPopen(['vagrant'] + params, cwd=cwd)
- return (p.returncode, p.output)
-
-
-def get_vagrant_sshinfo():
- """Get ssh connection info for a vagrant VM
-
- :returns: A dictionary containing 'hostname', 'port', 'user'
- and 'idfile'
- """
- if subprocess.call('vagrant ssh-config >sshconfig',
- cwd='builder', shell=True) != 0:
- raise BuildException("Error getting ssh config")
- vagranthost = 'default' # Host in ssh config file
- sshconfig = paramiko.SSHConfig()
- sshf = open(os.path.join('builder', 'sshconfig'), 'r')
- sshconfig.parse(sshf)
- sshf.close()
- sshconfig = sshconfig.lookup(vagranthost)
- idfile = sshconfig['identityfile']
- if isinstance(idfile, list):
- idfile = idfile[0]
- elif idfile.startswith('"') and idfile.endswith('"'):
- idfile = idfile[1:-1]
- return {'hostname': sshconfig['hostname'],
- 'port': int(sshconfig['port']),
- 'user': sshconfig['user'],
- 'idfile': idfile}
-
-
-def get_clean_vm(reset=False):
- """Get a clean VM ready to do a buildserver build.
-
- This might involve creating and starting a new virtual machine from
- scratch, or it might be as simple (unless overridden by the reset
- parameter) as re-using a snapshot created previously.
-
- A BuildException will be raised if anything goes wrong.
-
- :reset: True to force creating from scratch.
- :returns: A dictionary containing 'hostname', 'port', 'user'
- and 'idfile'
- """
- # Reset existing builder machine to a clean state if possible.
- vm_ok = False
- if not reset:
- logging.info("Checking for valid existing build server")
-
- if got_valid_builder_vm():
- logging.info("...VM is present")
- p = FDroidPopen(['VBoxManage', 'snapshot',
- get_builder_vm_id(), 'list',
- '--details'], cwd='builder')
- if 'fdroidclean' in p.output:
- logging.info("...snapshot exists - resetting build server to "
- "clean state")
- retcode, output = vagrant(['status'], cwd='builder')
-
- if 'running' in output:
- logging.info("...suspending")
- vagrant(['suspend'], cwd='builder')
- logging.info("...waiting a sec...")
- time.sleep(10)
- p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
- 'restore', 'fdroidclean'],
- cwd='builder')
-
- if p.returncode == 0:
- logging.info("...reset to snapshot - server is valid")
- retcode, output = vagrant(['up'], cwd='builder')
- if retcode != 0:
- raise BuildException("Failed to start build server")
- logging.info("...waiting a sec...")
- time.sleep(10)
- sshinfo = get_vagrant_sshinfo()
- vm_ok = True
- else:
- logging.info("...failed to reset to snapshot")
- else:
- logging.info("...snapshot doesn't exist - "
- "VBoxManage snapshot list:\n" + p.output)
-
- # If we can't use the existing machine for any reason, make a
- # new one from scratch.
- if not vm_ok:
- if os.path.exists('builder'):
- logging.info("Removing broken/incomplete/unwanted build server")
- vagrant(['destroy', '-f'], cwd='builder')
- shutil.rmtree('builder')
- os.mkdir('builder')
-
- p = subprocess.Popen(['vagrant', '--version'],
- universal_newlines=True,
- stdout=subprocess.PIPE)
- vver = p.communicate()[0].strip().split(' ')[1]
- if vver.split('.')[0] != '1' or int(vver.split('.')[1]) < 4:
- raise BuildException("Unsupported vagrant version {0}".format(vver))
-
- with open(os.path.join('builder', 'Vagrantfile'), 'w') as vf:
- vf.write('Vagrant.configure("2") do |config|\n')
- vf.write('config.vm.box = "buildserver"\n')
- vf.write('config.vm.synced_folder ".", "/vagrant", disabled: true\n')
- vf.write('end\n')
-
- logging.info("Starting new build server")
- retcode, _ = vagrant(['up'], cwd='builder')
- if retcode != 0:
- raise BuildException("Failed to start build server")
-
- # Open SSH connection to make sure it's working and ready...
- logging.info("Connecting to virtual machine...")
- sshinfo = get_vagrant_sshinfo()
- sshs = paramiko.SSHClient()
- sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())
- sshs.connect(sshinfo['hostname'], username=sshinfo['user'],
- port=sshinfo['port'], timeout=300,
- look_for_keys=False,
- key_filename=sshinfo['idfile'])
- sshs.close()
-
- logging.info("Saving clean state of new build server")
- retcode, _ = vagrant(['suspend'], cwd='builder')
- if retcode != 0:
- raise BuildException("Failed to suspend build server")
- logging.info("...waiting a sec...")
- time.sleep(10)
- p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
- 'take', 'fdroidclean'],
- cwd='builder')
- if p.returncode != 0:
- raise BuildException("Failed to take snapshot")
- logging.info("...waiting a sec...")
- time.sleep(10)
- logging.info("Restarting new build server")
- retcode, _ = vagrant(['up'], cwd='builder')
- if retcode != 0:
- raise BuildException("Failed to start build server")
- logging.info("...waiting a sec...")
- time.sleep(10)
- # Make sure it worked...
- p = FDroidPopen(['VBoxManage', 'snapshot', get_builder_vm_id(),
- 'list', '--details'],
- cwd='builder')
- if 'fdroidclean' not in p.output:
- raise BuildException("Failed to take snapshot.")
-
- return sshinfo
-
-
-def release_vm():
- """Release the VM previously started with get_clean_vm().
-
- This should always be called.
- """
- logging.info("Suspending build server")
- subprocess.call(['vagrant', 'suspend'], cwd='builder')
-
-
# Note that 'force' here also implies test mode.
def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
"""Do a build on the builder vm.
else:
logging.getLogger("paramiko").setLevel(logging.WARN)
- sshinfo = get_clean_vm()
+ sshinfo = vmtools.get_clean_builder('builder')
try:
if not buildserverid:
ftp.mkdir('metadata')
ftp.mkdir('srclibs')
ftp.chdir('metadata')
- ftp.put(os.path.join('metadata', app.id + '.txt'),
- app.id + '.txt')
+ ftp.put(app.metadatapath, os.path.basename(app.metadatapath))
+
# And patches if there are any...
if os.path.exists(os.path.join('metadata', app.id)):
send_dir(os.path.join('metadata', app.id))
ftp.close()
finally:
-
# Suspend the build server.
- release_vm()
+ vm = vmtools.get_build_vm('builder')
+ vm.suspend()
def force_gradle_build_tools(build_dir, build_tools):
path)
-def capitalize_intact(string):
- """Like str.capitalize(), but leave the rest of the string intact without
- switching it to lowercase."""
+def transform_first_char(string, method):
+ """Uses method() on the first character of string."""
if len(string) == 0:
return string
if len(string) == 1:
- return string.upper()
- return string[0].upper() + string[1:]
+ return method(string)
+ return method(string[0]) + string[1:]
-def get_metadata_from_apk(app, build, apkfile):
- """get the required metadata from the built APK"""
+def has_native_code(apkobj):
+ """aapt checks if there are architecture folders under the lib/ folder
+ so we are simulating the same behaviour"""
+ arch_re = re.compile("^lib/(.*)/.*$")
+ arch = [file for file in apkobj.get_files() if arch_re.match(file)]
+ return False if not arch else True
- p = SdkToolsPopen(['aapt', 'dump', 'badging', apkfile], output=False)
+def get_apk_metadata_aapt(apkfile):
+ """aapt function to extract versionCode, versionName, packageName and nativecode"""
vercode = None
version = None
foundid = None
nativecode = None
+
+ p = SdkToolsPopen(['aapt', 'dump', 'badging', apkfile], output=False)
+
for line in p.output.splitlines():
if line.startswith("package:"):
pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
elif line.startswith("native-code:"):
nativecode = line[12:]
+ return vercode, version, foundid, nativecode
+
+
+def get_apk_metadata_androguard(apkfile):
+ """androguard function to extract versionCode, versionName, packageName and nativecode"""
+ try:
+ from androguard.core.bytecodes.apk import APK
+ apkobject = APK(apkfile)
+ except ImportError:
+ raise BuildException("androguard library is not installed and aapt binary not found")
+ except FileNotFoundError:
+ raise BuildException("Could not open apk file for metadata analysis")
+
+ if not apkobject.is_valid_APK():
+ raise BuildException("Invalid APK provided")
+
+ foundid = apkobject.get_package()
+ vercode = apkobject.get_androidversion_code()
+ version = apkobject.get_androidversion_name()
+ nativecode = has_native_code(apkobject)
+
+ return vercode, version, foundid, nativecode
+
+
+def get_metadata_from_apk(app, build, apkfile):
+ """get the required metadata from the built APK"""
+
+ if common.SdkToolsPopen(['aapt', 'version'], output=False):
+ vercode, version, foundid, nativecode = get_apk_metadata_aapt(apkfile)
+ else:
+ vercode, version, foundid, nativecode = get_apk_metadata_androguard(apkfile)
+
# Ignore empty strings or any kind of space/newline chars that we don't
# care about
if nativecode is not None:
def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver, refresh):
"""Do a build locally."""
-
ndk_path = build.ndk_path()
if build.ndk or (build.buildjni and build.buildjni != ['no']):
if not ndk_path:
if k.endswith("_orig"):
continue
logging.critical(" %s: %s" % (k, v))
- sys.exit(3)
+ raise FDroidException()
elif not os.path.isdir(ndk_path):
logging.critical("Android NDK '%s' is not a directory!" % ndk_path)
- sys.exit(3)
+ raise FDroidException()
common.set_FDroidPopen_env(build)
# create ..._toolsversion.log when running in builder vm
if onserver:
+ # before doing anything, run the sudo commands to setup the VM
+ if build.sudo:
+ logging.info("Running 'sudo' commands in %s" % os.getcwd())
+
+ p = FDroidPopen(['sudo', 'bash', '-x', '-c', build.sudo])
+ if p.returncode != 0:
+ raise BuildException("Error running sudo command for %s:%s" %
+ (app.id, build.versionName), p.output)
+
log_path = os.path.join(log_dir,
common.get_toolsversion_logname(app, build))
with open(log_path, 'w') as f:
f.write(get_android_tools_version_log(build.ndk_path()))
+ else:
+ if build.sudo:
+ logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s'
+ % (app.id, build.versionName, build.sudo))
# Prepare the source code...
root_dir, srclibpaths = common.prepare_source(vcs, app, build,
if flavours == ['yes']:
flavours = []
- flavours_cmd = ''.join([capitalize_intact(flav) for flav in flavours])
+ flavours_cmd = ''.join([transform_first_char(flav, str.upper) for flav in flavours])
gradletasks += ['assemble' + flavours_cmd + 'Release']
elif bmethod == 'kivy':
pass
+ elif bmethod == 'buildozer':
+ pass
+
elif bmethod == 'ant':
logging.info("Cleaning Ant project...")
p = FDroidPopen(['ant', 'clean'], cwd=root_dir)
else:
# Scan before building...
logging.info("Scanning source for common problems...")
- count = scanner.scan_source(build_dir, root_dir, build)
+ count = scanner.scan_source(build_dir, build)
if count > 0:
if force:
logging.warn('Scanner found %d problems' % count)
cmd.append('release')
p = FDroidPopen(cmd, cwd=distdir)
+ elif bmethod == 'buildozer':
+ logging.info("Building Kivy project using buildozer...")
+
+ # parse buildozer.spez
+ spec = os.path.join(root_dir, 'buildozer.spec')
+ if not os.path.exists(spec):
+ raise BuildException("Expected to find buildozer-compatible spec at {0}"
+ .format(spec))
+ defaults = {'orientation': 'landscape', 'icon': '',
+ 'permissions': '', 'android.api': "19"}
+ bconfig = ConfigParser(defaults, allow_no_value=True)
+ bconfig.read(spec)
+
+ # update spec with sdk and ndk locations to prevent buildozer from
+ # downloading.
+ loc_ndk = common.env['ANDROID_NDK']
+ loc_sdk = common.env['ANDROID_SDK']
+ if loc_ndk == '$ANDROID_NDK':
+ loc_ndk = loc_sdk + '/ndk-bundle'
+
+ bc_ndk = None
+ bc_sdk = None
+ try:
+ bc_ndk = bconfig.get('app', 'android.sdk_path')
+ except Exception:
+ pass
+ try:
+ bc_sdk = bconfig.get('app', 'android.ndk_path')
+ except Exception:
+ pass
+
+ if bc_sdk is None:
+ bconfig.set('app', 'android.sdk_path', loc_sdk)
+ if bc_ndk is None:
+ bconfig.set('app', 'android.ndk_path', loc_ndk)
+
+ fspec = open(spec, 'w')
+ bconfig.write(fspec)
+ fspec.close()
+
+ logging.info("sdk_path = %s" % loc_sdk)
+ logging.info("ndk_path = %s" % loc_ndk)
+
+ p = None
+ # execute buildozer
+ cmd = ['buildozer', 'android', 'release']
+ try:
+ p = FDroidPopen(cmd, cwd=root_dir)
+ except Exception:
+ pass
+
+ # buidozer not installed ? clone repo and run
+ if (p is None or p.returncode != 0):
+ cmd = ['git', 'clone', 'https://github.com/kivy/buildozer.git']
+ p = subprocess.Popen(cmd, cwd=root_dir, shell=False)
+ p.wait()
+ if p.returncode != 0:
+ raise BuildException("Distribute build failed")
+
+ cmd = ['python', 'buildozer/buildozer/scripts/client.py', 'android', 'release']
+ p = FDroidPopen(cmd, cwd=root_dir)
+
+ # expected to fail.
+ # Signing will fail if not set by environnment vars (cf. p4a docs).
+ # But the unsigned apk will be ok.
+ p.returncode = 0
+
elif bmethod == 'gradle':
logging.info("Building Gradle project...")
'{0}-{1}-release.apk'.format(
bconfig.get('app', 'title'),
bconfig.get('app', 'version')))
- elif omethod == 'gradle':
+
+ elif omethod == 'buildozer':
src = None
for apks_dir in [
- os.path.join(root_dir, 'build', 'outputs', 'apk'),
- os.path.join(root_dir, 'build', 'apk'),
+ os.path.join(root_dir, '.buildozer', 'android', 'platform', 'build', 'dists', bconfig.get('app', 'title'), 'bin'),
]:
for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
apks = glob.glob(os.path.join(apks_dir, apkglob))
if src is None:
raise BuildException('Failed to find any output apks')
+ elif omethod == 'gradle':
+ src = None
+ apk_dirs = [
+ os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'),
+ os.path.join(root_dir, 'build', 'outputs', 'apk'),
+ os.path.join(root_dir, 'build', 'apk'),
+ ]
+ if flavours_cmd:
+ apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
+ for apks_dir in apk_dirs:
+ for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
+ apks = glob.glob(os.path.join(apks_dir, apkglob))
+
+ if len(apks) > 1:
+ raise BuildException('More than one resulting apks found in %s' % apks_dir,
+ '\n'.join(apks))
+ if len(apks) == 1:
+ src = apks[0]
+ break
+ if src is not None:
+ break
+
+ if src is None:
+ raise BuildException('Failed to find any output apks')
+
elif omethod == 'ant':
stdout_apk = '\n'.join([
line for line in p.output.splitlines() if '.apk' in line])
src = os.path.normpath(apks[0])
# Make sure it's not debuggable...
- if common.isApkAndDebuggable(src, config):
+ if common.isApkAndDebuggable(src):
raise BuildException("APK is debuggable")
# By way of a sanity check, make sure the version and version
this is the 'unsigned' directory.
:param repo_dir: The repo directory - used for checking if the build is
necessary.
- :paaram also_check_dir: An additional location for checking if the build
+ :param also_check_dir: An additional location for checking if the build
is necessary (usually the archive repo)
:param test: True if building in test mode, in which case the build will
always happen, even if the output already exists. In test mode, the
url = url.replace('%v', build.versionName)
url = url.replace('%c', str(build.versionCode))
logging.info("...retrieving " + url)
- of = common.get_release_filename(app, build) + '.binary'
+ of = re.sub(r'.apk$', '.binary.apk', common.get_release_filename(app, build))
of = os.path.join(output_dir, of)
try:
net.download_file(url, local_filename=of)
except requests.exceptions.HTTPError as e:
- raise FDroidException('downloading Binaries from %s failed' % url) from e
+ raise FDroidException(
+ 'Downloading Binaries from %s failed. %s' % (url, e))
# Now we check weather the build can be verified to
# match the supplied binary or not. Should the
~ianmdlvl / fdroidserver.git / blobdiff