kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Add support for gradle={main,yes,}

Browse Source
This commit is contained in:
Daniel Martí 2013-08-17 15:16:13 +02:00
parent dfc10b64fc
commit b55060f4c7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/build.py
View File

@ -431,6 +431,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
subprocess.call(['sed', '-i',
's@com.android.tools.build:gradle:[0-9\.\+]*@com.android.tools.build:gradle:'+gradle_plugin+'@g',
'build.gradle'], cwd=root_dir)
if flavour in ['main', 'yes', '']:
flavour = ''
if install:
commands = [gradle, 'assemble'+flavour+'Debug', 'install'+flavour+'Debug']
@ -490,7 +493,11 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
elif 'gradle' in thisbuild:
if 'subdir' in thisbuild:
build_dir = os.path.join(build_dir, thisbuild['subdir'])
src = os.path.join(build_dir, 'build', 'apk', '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned'])+'.apk')
if flavour in ['main', 'yes', '']:
name = '-'.join([os.path.basename(build_dir), 'release', 'unsigned'])
else:
name = '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned'])
src = os.path.join(build_dir, 'build', 'apk', name+'.apk')
else:
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
re.S|re.M).group(1)