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

New gradle=[flavour] field

Browse source
This commit is contained in:
Daniel Martí 2013-08-03 17:07:55 +02:00
parent 59e212d7a3
commit a5b8659632
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/build.py
View file

@ -415,6 +415,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if 'mvnflags' in thisbuild: if 'mvnflags' in thisbuild:
mvncmd += thisbuild['mvnflags'] mvncmd += thisbuild['mvnflags']
p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
elif 'gradle' in thisbuild:
flavour = thisbuild['gradle']
p = subprocess.Popen(gradle, 'assemble'+flavour+'Release', cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
else: else:
if install: if install:
antcommands = ['debug','install'] antcommands = ['debug','install']

2
fdroidserver/common.py
View file

@ -1133,7 +1133,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
# Generate (or update) the ant build file, build.xml... # Generate (or update) the ant build file, build.xml...
updatemode = build.get('update', '.') updatemode = build.get('update', '.')
if (updatemode != 'no' and if (updatemode != 'no' and
'maven' not in build): 'maven' not in build and 'gradle' not in build):
parms = [os.path.join(sdk_path, 'tools', 'android'), parms = [os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p', '.'] 'update', 'project', '-p', '.']
parms.append('--subprojects') parms.append('--subprojects')