From: relan <email@hidden>
Date: Wed, 10 Jan 2018 18:06:32 +0000 (+0300)
Subject: build: clean up only known subdirectories in build/*
X-Git-Tag: 1.0.1~44^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e29be52da0c00156c3055026615ba8b9830ef463;p=fdroidserver.git

build: clean up only known subdirectories in build/*

We remove the whole "build" directory while cleaning source code tree
because Gradle can leave there files even after "gradle clean". But some
projects (Mozilla Fennec) actually have useful stuff checked into VCS
under the "build" directory.

Remove only those subdirectories that we known for sure are leftovers
from Gradle.

Fixes fdroid/fdroidserver#438.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 83cb18ab..39bde47b 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -518,8 +518,14 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
             # Even when running clean, gradle stores task/artifact caches in
             # .gradle/ as binary files. To avoid overcomplicating the scanner,
             # manually delete them, just like `gradle clean` should have removed
-            # the build/ dirs.
-            del_dirs(['build', '.gradle'])
+            # the build/* dirs.
+            del_dirs([os.path.join('build', 'android-profile'),
+                      os.path.join('build', 'generated'),
+                      os.path.join('build', 'intermediates'),
+                      os.path.join('build', 'outputs'),
+                      os.path.join('build', 'reports'),
+                      os.path.join('build', 'tmp'),
+                      '.gradle'])
             del_files(['gradlew', 'gradlew.bat'])
 
         if 'pom.xml' in files: