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:
9779979
)
Apk output path is build/outputs/apk/*.apk since 0.11
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 12 Jun 2014 08:04:20 +0000
(10:04 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 12 Jun 2014 08:04:20 +0000
(10:04 +0200)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 065ea324ebf031e7642441c0dd6abaa77e7f3382..81c01e63fc7e50763d49019377af03c985d624b1 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-760,7
+760,10
@@
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
else:
name = '-'.join([basename, '-'.join(flavours), 'release', 'unsigned'])
dd = os.path.normpath(dd)
else:
name = '-'.join([basename, '-'.join(flavours), 'release', 'unsigned'])
dd = os.path.normpath(dd)
- src = os.path.join(dd, 'build', 'apk', name + '.apk')
+ if thisbuild['gradlepluginver'] >= LooseVersion('0.11'):
+ src = os.path.join(dd, 'build', 'outputs', 'apk', name + '.apk')
+ else:
+ src = os.path.join(dd, 'build', 'apk', name + '.apk')
elif thisbuild['type'] == 'ant':
stdout_apk = '\n'.join([
line for line in p.stdout.splitlines() if '.apk' in line])
elif thisbuild['type'] == 'ant':
stdout_apk = '\n'.join([
line for line in p.stdout.splitlines() if '.apk' in line])