mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix maven apk finding method

Browse source
This commit is contained in:
Daniel Martí 2013-11-08 18:56:28 +01:00
parent b313c12637
commit 55e3fc9aa3
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -555,15 +555,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
bindir = os.path.join(root_dir, 'bin') bindir = os.path.join(root_dir, 'bin')
if 'maven' in thisbuild: if 'maven' in thisbuild:
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 any(a in line for a in ('apk','ap_'))])
m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
stdout_apk, re.S|re.M) stdout_apk, re.S|re.M)
if not m: if not m:
m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk[^l]", m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk[^l]",
stdout_apk, re.S|re.M) stdout_apk, re.S|re.M)
if not m: if not m:
# This format is found in com.github.mobile, com.yubico.yubitotp and com.botbrew.basil for example... m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + r'/([^/]+)\.ap[_k][,\]]',
m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + '/([^/]+)\.ap[_k][,\]]',
stdout_apk, re.S|re.M) stdout_apk, re.S|re.M)
if not m: if not m:
raise BuildException('Failed to find output') raise BuildException('Failed to find output')