chiark / gitweb /
Additional maven output detection
authorCiaran Gultnieks <ciaran@ciarang.com>
Mon, 13 Aug 2012 09:16:25 +0000 (10:16 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Mon, 13 Aug 2012 09:16:25 +0000 (10:16 +0100)
fdroidserver/build.py

index d7a7144e0eb9804f3efe7ba8bf120ca745903783..71aca20a9aa9cae3a4f2542eda411424f6e0037d 100644 (file)
@@ -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')