shutil.rmtree('builder')
os.mkdir('builder')
- p = subprocess.Popen('vagrant --version', shell=True,
+ p = subprocess.Popen(['vagrant', '--version'],
stdout=subprocess.PIPE)
vver = p.communicate()[0]
if vver.startswith('Vagrant version 1.2'):
if thisbuild['srclibs']:
for lib in thisbuild['srclibs']:
srclibpaths.append(
- common.getsrclib(lib, 'build/srclib', srclibpaths,
- basepath=True, prepare=False))
+ common.getsrclib(lib, 'build/srclib', basepath=True, prepare=False))
# If one was used for the main source, add that too.
basesrclib = vcs.getsrclib()
def adapt_gradle(build_dir):
+ filename = 'build.gradle'
for root, dirs, files in os.walk(build_dir):
- if 'build.gradle' in files:
- path = os.path.join(root, 'build.gradle')
- logging.debug("Adapting build.gradle at %s" % path)
+ for filename in files:
+ if not filename.endswith('.gradle'):
+ continue
+ path = os.path.join(root, filename)
+ if not os.path.isfile(path):
+ continue
+ logging.debug("Adapting %s at %s" % (filename, path))
FDroidPopen(['sed', '-i',
- r's@buildToolsVersion\([ =]*\)["\'][0-9\.]*["\']@buildToolsVersion\1"'
+ r's@buildToolsVersion\([ =]\+\).*@buildToolsVersion\1"'
+ config['build_tools'] + '"@g', path])
return string[0].upper() + string[1:]
-def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver):
+def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver, refresh):
"""Do a build locally."""
if thisbuild['buildjni'] and thisbuild['buildjni'] != ['no']:
sys.exit(3)
# Set up environment vars that depend on each build
- for n in ['ANDROID_NDK', 'NDK']:
+ for n in ['ANDROID_NDK', 'NDK', 'ANDROID_NDK_HOME']:
common.env[n] = thisbuild['ndk_path']
+ common.reset_env_path()
+ # Set up the current NDK to the PATH
+ common.add_to_env_path(thisbuild['ndk_path'])
+
# Prepare the source code...
root_dir, srclibpaths = common.prepare_source(vcs, app, thisbuild,
build_dir, srclib_dir,
- extlib_dir, onserver)
+ extlib_dir, onserver, refresh)
# We need to clean via the build tool in case the binary dirs are
# different from the default ones
adapt_gradle(libpath)
cmd = [config['gradle']]
- cmd += ['clean' + capitalize_intact(task) for task in gradletasks]
+ for task in gradletasks:
+ parts = task.split(':')
+ parts[-1] = 'clean' + capitalize_intact(parts[-1])
+ cmd += [':'.join(parts)]
+
+ cmd += ['clean']
p = FDroidPopen(cmd, cwd=root_dir)
if 'gradle' in dirs:
shutil.rmtree(os.path.join(root, 'gradle'))
- if not options.skipscan:
+ if options.skipscan:
+ if thisbuild['scandelete']:
+ raise BuildException("Refusing to skip source scan since scandelete is present")
+ else:
# Scan before building...
logging.info("Scanning source for common problems...")
count = common.scan_source(build_dir, root_dir, thisbuild)
if count > 0:
if force:
- logging.warn('Scanner found %d problems:' % count)
+ logging.warn('Scanner found %d problems' % count)
else:
raise BuildException("Can't build due to %d errors while scanning" % count)
cmd += ' ./distribute.sh'
cmd += ' -m ' + "'" + ' '.join(modules) + "'"
cmd += ' -d fdroid'
- p = FDroidPopen(cmd, cwd='python-for-android', shell=True)
+ p = subprocess.Popen(cmd, cwd='python-for-android', shell=True)
if p.returncode != 0:
raise BuildException("Distribute build failed")
def trybuild(app, thisbuild, build_dir, output_dir, also_check_dir, srclib_dir, extlib_dir,
- tmp_dir, repo_dir, vcs, test, server, force, onserver):
+ tmp_dir, repo_dir, vcs, test, server, force, onserver, refresh):
"""
Build a particular version of an application, if it needs building.
build_server(app, thisbuild, vcs, build_dir, output_dir, force)
else:
- build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver)
+ build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver, refresh)
return True
help="Skip scanning the source code for binaries and other problems")
parser.add_option("--no-tarball", dest="notarball", action="store_true", default=False,
help="Don't create a source tarball, useful when testing a build")
+ parser.add_option("--no-refresh", dest="refresh", action="store_false", default=True,
+ help="Don't refresh the repository, useful when testing a build with no internet connection")
parser.add_option("-f", "--force", action="store_true", default=False,
help="Force build of disabled apps, and carries on regardless of scan problems. Only allowed in test mode.")
parser.add_option("-a", "--all", action="store_true", default=False,
also_check_dir, srclib_dir, extlib_dir,
tmp_dir, repo_dir, vcs, options.test,
options.server, options.force,
- options.onserver):
+ options.onserver, options.refresh):
+
+ if app.get('Binaries', None):
+ # This is an app where we build from source, and
+ # verify the apk contents against a developer's
+ # binary. We get that binary now, and save it
+ # alongside our built one in the 'unsigend'
+ # directory.
+ url = app['Binaries']
+ url = url.replace('%v', thisbuild['version'])
+ url = url.replace('%c', str(thisbuild['vercode']))
+ logging.info("...retrieving " + url)
+ of = "{0}_{1}.apk.binary".format(app['id'], thisbuild['vercode'])
+ of = os.path.join(output_dir, of)
+ common.download_file(url, local_filename=of)
+
build_succeeded.append(app)
wikilog = "Build succeeded"
except BuildException as be:
~ianmdlvl / fdroidserver.git / blobdiff