kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 18:50:11 +02:00
Code Activity

build.py: pass options.verbose all the way to common.prepare_source

Browse Source
This commit is contained in:
Tias Guns 2012-03-12 21:11:45 +00:00
parent b78700245c
commit 1ab5a4be0d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/build.py
View File

@ -118,13 +118,13 @@ def build_server(app, thisbuild, build_dir, output_dir):
raise BuildException("Failed to destroy") raise BuildException("Failed to destroy")
def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force): def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force, verbose=False):
"""Do a build locally.""" """Do a build locally."""
# Prepare the source code... # Prepare the source code...
root_dir = common.prepare_source(vcs, app, thisbuild, root_dir = common.prepare_source(vcs, app, thisbuild,
build_dir, extlib_dir, sdk_path, ndk_path, build_dir, extlib_dir, sdk_path, ndk_path,
javacc_path) javacc_path, verbose)
# Scan before building... # Scan before building...
buildprobs = common.scan_source(build_dir, root_dir, thisbuild) buildprobs = common.scan_source(build_dir, root_dir, thisbuild)
@ -260,7 +260,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
def trybuild(app, thisbuild, build_dir, output_dir, extlib_dir, tmp_dir, def trybuild(app, thisbuild, build_dir, output_dir, extlib_dir, tmp_dir,
repo_dir, vcs, test, server, install, force): repo_dir, vcs, test, server, install, force, verbose=False):
""" """
Build a particular version of an application, if it needs building. Build a particular version of an application, if it needs building.
@ -283,7 +283,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, extlib_dir, tmp_dir,
if server: if server:
build_server(app, thisbuild, build_dir, output_dir) build_server(app, thisbuild, build_dir, output_dir)
else: else:
build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force) build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force, verbose)
return True return True
@ -403,7 +403,7 @@ def main():
try: try:
if trybuild(app, thisbuild, build_dir, output_dir, extlib_dir, if trybuild(app, thisbuild, build_dir, output_dir, extlib_dir,
tmp_dir, repo_dir, vcs, options.test, options.server, tmp_dir, repo_dir, vcs, options.test, options.server,
options.install, options.force): options.install, options.force, options.verbose):
build_succeeded.append(app) build_succeeded.append(app)
except BuildException as be: except BuildException as be:
if options.stop: if options.stop: