1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00

Additional maven output detection

This commit is contained in:
Ciaran Gultnieks 2012-08-13 10:16:25 +01:00
parent c85d326dee
commit 4d4f3f3838

View File

@ -206,6 +206,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
if not m: if not m:
m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk", m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
output, re.S|re.M) output, re.S|re.M)
if not m:
# This format is found in com.github.mobile for example...
m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]",
output, re.S|re.M)
if not m: if not m:
print output print output
raise BuildException('Failed to find output') raise BuildException('Failed to find output')