From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 17 Aug 2013 13:16:13 +0000 (+0200)
Subject: Add support for gradle={main,yes,}
X-Git-Tag: 0.1~443
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b55060f4c73d4bba5d4b262d72f4f7176a46b19b;p=fdroidserver.git

Add support for gradle={main,yes,}
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 672a06cf..5c294e48 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -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)