From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 12 Aug 2014 10:56:15 +0000 (+0200)
Subject: Try to fix apk path matching with newer maven plugin versions
X-Git-Tag: 0.3.0~93
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1af98e9f09b6929116694ec1234e2ce58dd28cd4;p=fdroidserver.git

Try to fix apk path matching with newer maven plugin versions
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 7bacd4c0..02bf8af5 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -719,7 +719,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
     if thisbuild['type'] == 'maven':
         stdout_apk = '\n'.join([
-            line for line in p.output.splitlines() if any(a in line for a in ('.apk', '.ap_'))])
+            line for line in p.output.splitlines() if any(
+                a in line for a in ('.apk', '.ap_', '.jar'))])
         m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
                      stdout_apk, re.S | re.M)
         if not m:
@@ -728,6 +729,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         if not m:
             m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + r'/([^/]+)\.ap[_k][,\]]',
                          stdout_apk, re.S | re.M)
+
+        if not m:
+            m = re.match(r".*^\[INFO\] Building jar: .*/" + bindir + r"/(.+)\.jar",
+                         stdout_apk, re.S | re.M)
         if not m:
             raise BuildException('Failed to find output')
         src = m.group(1)