From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 13 Aug 2012 09:16:25 +0000 (+0100)
Subject: Additional maven output detection
X-Git-Tag: 0.1~792
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4d4f3f3838ed48baac0ca38ee1ecd84b232b95f5;p=fdroidserver.git

Additional maven output detection
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index d7a7144e..71aca20a 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -206,6 +206,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
         if not m:
             m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
                     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:
             print output
             raise BuildException('Failed to find output')