From a5b86596329724bdd8ba5c5b0d1ff7e0b6414891 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 3 Aug 2013 17:07:55 +0200 Subject: [PATCH] New gradle=[flavour] field --- fdroidserver/build.py | 3 +++ fdroidserver/common.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index e51716b2..94835efc 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -415,6 +415,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d if 'mvnflags' in thisbuild: mvncmd += thisbuild['mvnflags'] 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: if install: antcommands = ['debug','install'] diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a363ffb5..8baa502f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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... updatemode = build.get('update', '.') 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'), 'update', 'project', '-p', '.'] parms.append('--subprojects') -- 2.30.2