kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Revert "Always print output directly if -v/--verbose"

Browse Source 
This reverts commit 9e09088245.
This commit is contained in:
Daniel Martí 2013-09-01 17:45:09 +02:00
parent 03b54e8506
commit 333c4af9f5
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdroidserver/build.py
View File

@ -438,13 +438,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if 'mvnflags' in thisbuild: if 'mvnflags' in thisbuild:
mvncmd += thisbuild['mvnflags'] mvncmd += thisbuild['mvnflags']
p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
# Output directly to console
if options.verbose:
print "Running %s on %s" % (" ".join(mvncmd), root_dir)
p = subprocess.Popen(mvncmd, cwd=root_dir)
else:
p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
elif 'gradle' in thisbuild: elif 'gradle' in thisbuild:
print "Building Gradle project..." print "Building Gradle project..."
if '@' in thisbuild['gradle']: if '@' in thisbuild['gradle']:
@ -484,31 +478,25 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else: else:
commands += ['assemble'+flavour+'Release'] commands += ['assemble'+flavour+'Release']
# Output directly to console
if verbose: if verbose:
print "Running %s on %s" % (" ".join(commands), gradle_dir) print "Running %s on %s" % (" ".join(commands), gradle_dir)
p = subprocess.Popen(commands, cwd=gradle_dir)
else: p = subprocess.Popen(commands, cwd=gradle_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
p = subprocess.Popen(commands, cwd=gradle_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
else: else:
print "Building Ant project..." print "Building Ant project..."
antcommands = ['ant']
if install: if install:
antcommands += ['debug','install'] antcommands = ['debug','install']
elif 'antcommand' in thisbuild: elif 'antcommand' in thisbuild:
antcommands += [thisbuild['antcommand']] antcommands = [thisbuild['antcommand']]
else: else:
antcommands += ['release'] antcommands = ['release']
p = subprocess.Popen(['ant'] + antcommands, cwd=root_dir,
# Output directly to console stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if verbose:
print "Running %s on %s" % (" ".join(antcommands), root_dir)
p = subprocess.Popen(antcommands, cwd=root_dir)
else:
p = subprocess.Popen(antcommands, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
output, error = p.communicate() output, error = p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip()) raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip())
if verbose:
print output
if install: if install:
if 'maven' in thisbuild: if 'maven' in thisbuild:
p = subprocess.Popen([mvn3, 'android:deploy', '-Dandroid.sdk.path=' + sdk_path], p = subprocess.Popen([mvn3, 'android:deploy', '-Dandroid.sdk.path=' + sdk_path],