chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output= is now a glob path and can do gradle
[fdroidserver.git]
/
fdroidserver
/
common.py
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 0463db29ad4d7c238db7e6f7edbe0eb341d4e47f..5a6c64ab2eec23de95ad8e1856e9439218f6ff1e 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-1372,7
+1372,7
@@
def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
f.write(props)
flavours = []
f.write(props)
flavours = []
- if build.method() == 'gradle':
+ if build.
build_
method() == 'gradle':
flavours = build.gradle
if build.target:
flavours = build.gradle
if build.target:
@@
-1461,7
+1461,7
@@
def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
(app.id, build.version), p.output)
# Generate (or update) the ant build file, build.xml...
(app.id, build.version), p.output)
# Generate (or update) the ant build file, build.xml...
- if build.method() == 'ant' and build.update != ['no']:
+ if build.
build_
method() == 'ant' and build.update != ['no']:
parms = ['android', 'update', 'lib-project']
lparms = ['android', 'update', 'project']
parms = ['android', 'update', 'lib-project']
lparms = ['android', 'update', 'project']