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

Avoid default cases in build types

Browse Source
This commit is contained in:
Daniel Martí 2014-01-28 22:14:28 +01:00
parent d42dd276a0
commit 8bbe38f172
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/build.py
View File

@ -607,7 +607,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
p = FDroidPopen(commands, cwd=gradle_dir) p = FDroidPopen(commands, cwd=gradle_dir)
else: elif thisbuild['type'] == 'ant':
print "Building Ant project..." print "Building Ant project..."
cmd = ['ant'] cmd = ['ant']
if 'antcommand' in thisbuild: if 'antcommand' in thisbuild:
@ -649,7 +649,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else: else:
name = '-'.join([os.path.basename(dd), '-'.join(flavours), 'release', 'unsigned']) name = '-'.join([os.path.basename(dd), '-'.join(flavours), 'release', 'unsigned'])
src = os.path.join(dd, 'build', 'apk', name+'.apk') src = os.path.join(dd, 'build', 'apk', name+'.apk')
else: elif thisbuild['type'] == 'ant':
stdout_apk = '\n'.join([ stdout_apk = '\n'.join([
line for line in p.stdout.splitlines() if '.apk' in line]) line for line in p.stdout.splitlines() if '.apk' in line])
src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk, src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk,