chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c85d326
)
Additional maven output detection
author
Ciaran Gultnieks
<ciaran@ciarang.com>
Mon, 13 Aug 2012 09:16:25 +0000
(10:16 +0100)
committer
Ciaran Gultnieks
<ciaran@ciarang.com>
Mon, 13 Aug 2012 09:16:25 +0000
(10:16 +0100)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index d7a7144e0eb9804f3efe7ba8bf120ca745903783..71aca20a9aa9cae3a4f2542eda411424f6e0037d 100644
(file)
--- 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')