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

Changing that from the expected value will trip someone up in the future

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-10-27 17:03:28 +00:00
parent ccdea798fc
commit b556693d4a
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/build.py
View file

@ -573,13 +573,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = m.group(1) src = m.group(1)
src = os.path.join(bindir, src) + '.apk' src = os.path.join(bindir, src) + '.apk'
elif 'gradle' in thisbuild: elif 'gradle' in thisbuild:
dd = build_dir
if 'subdir' in thisbuild: if 'subdir' in thisbuild:
build_dir = os.path.join(build_dir, thisbuild['subdir']) dd = os.path.join(dd, thisbuild['subdir'])
if flavour in ['main', 'yes', '']: if flavour in ['main', 'yes', '']:
name = '-'.join([os.path.basename(build_dir), 'release', 'unsigned']) name = '-'.join([os.path.basename(dd), 'release', 'unsigned'])
else: else:
name = '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned']) name = '-'.join([os.path.basename(dd), flavour, 'release', 'unsigned'])
src = os.path.join(build_dir, 'build', 'apk', name+'.apk') src = os.path.join(dd, 'build', 'apk', name+'.apk')
else: else:
src = re.match(r".*^.*Creating (.+) for release.*$.*", p.stdout_apk, src = re.match(r".*^.*Creating (.+) for release.*$.*", p.stdout_apk,
re.S|re.M).group(1) re.S|re.M).group(1)