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:
89a9447
)
Proper apk path for gradle
author
Daniel Martí
<mvdan@mvdan.cc>
Mon, 5 Aug 2013 18:01:02 +0000
(20:01 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Mon, 5 Aug 2013 18:01:02 +0000
(20:01 +0200)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 444ba8c88f4395b5d4293ceb665bd888cd3b3f29..e0caa615c303c659ed6e59db7b3f0f1f676834d8 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-468,7
+468,7
@@
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = m.group(1)
src = os.path.join(bindir, src) + '.apk'
elif 'gradle' in thisbuild:
- src = os.path.join(
'build', 'apk', '-'.join([app['Auto Name'], flavour, 'release', 'unsigned')+'.apk']
)
+ src = os.path.join(
build_dir, 'build', 'apk', '-'.join([app['id'], flavour, 'release', 'unsigned'])+'.apk'
)
else:
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
re.S|re.M).group(1)