From: Marcus Hoffmann <bubuiic@aol.com>
Date: Sat, 26 Aug 2017 15:03:13 +0000 (+0200)
Subject: add comments to gradle output directories
X-Git-Tag: 0.9~95^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b148b82f8353f5f01361391a0d434b129384af92;p=fdroidserver.git

add comments to gradle output directories
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index c43b18fd..3bca0a8f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -803,10 +803,16 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
     elif omethod == 'gradle':
         src = None
         apk_dirs = [
+            # gradle plugin >= 3.0
             os.path.join(root_dir, 'build', 'outputs', 'apk', 'release'),
+            # gradle plugin < 3.0 and >= 0.11
             os.path.join(root_dir, 'build', 'outputs', 'apk'),
+            # really old path
             os.path.join(root_dir, 'build', 'apk'),
             ]
+        # If we build with gradle flavours with gradle plugin >= 3.0 the apk will be in
+        # a subdirectory corresponding to the flavour command used, but with different
+        # capitalization.
         if flavours_cmd:
             apk_dirs.append(os.path.join(root_dir, 'build', 'outputs', 'apk', transform_first_char(flavours_cmd, str.lower), 'release'))
         for apks_dir in apk_dirs: