mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix apk path on gradle builds where both subdir and flavour@dir are used

Browse source
This commit is contained in:
Daniel Martí 2014-04-01 19:25:43 +02:00
parent d8374b3efa
commit 5dc29c8a05
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/build.py
View file

@ -653,13 +653,19 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = 'python-for-android/dist/default/bin/{0}-{1}-release.apk'.format( src = 'python-for-android/dist/default/bin/{0}-{1}-release.apk'.format(
bconfig.get('app', 'title'), bconfig.get('app', 'version')) bconfig.get('app', 'title'), bconfig.get('app', 'version'))
elif thisbuild['type'] == 'gradle': elif thisbuild['type'] == 'gradle':
basename = app['id']
dd = build_dir dd = build_dir
if 'subdir' in thisbuild: if 'subdir' in thisbuild:
dd = os.path.join(dd, thisbuild['subdir']) dd = os.path.join(dd, thisbuild['subdir'])
basename = thisbuild['subdir']
if '@' in thisbuild['gradle']:
dd = os.path.join(dd, thisbuild['gradle'].split('@')[1])
basename = app['id']
if len(flavours) == 1 and flavours[0] == '': if len(flavours) == 1 and flavours[0] == '':
name = '-'.join([os.path.basename(dd), 'release', 'unsigned']) name = '-'.join([basename, 'release', 'unsigned'])
else: else:
name = '-'.join([os.path.basename(dd), '-'.join(flavours), 'release', 'unsigned']) name = '-'.join([basename, '-'.join(flavours), 'release', 'unsigned'])
dd = os.path.normpath(dd)
src = os.path.join(dd, 'build', 'apk', name+'.apk') src = os.path.join(dd, 'build', 'apk', name+'.apk')
elif thisbuild['type'] == 'ant': elif thisbuild['type'] == 'ant':
stdout_apk = '\n'.join([ stdout_apk = '\n'.join([