From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 6 Jan 2014 11:44:48 +0000 (+0100)
Subject: Run ant clean in update= dirs instead of removing dirs
X-Git-Tag: 0.1~57
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=125a36b4dea1eac0df7021b4c82744db4b770759;p=fdroidserver.git

Run ant clean in update= dirs instead of removing dirs
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 47a006b4..f648ef7d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -941,13 +941,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
                 os.remove(buildxml)
 
         for d in update_dirs:
-            # Remove gen and bin dirs in libraries
-            # rid of them...
-            for baddir in ['gen', 'bin', 'obj']
-                badpath = os.path.join(root_dir, d, baddir)
-                if os.path.exists(badpath):
-                    print "Removing '%s'" % badpath
-                    shutil.rmtree(badpath)
+            subdir = os.path.join(root_dir, d)
+            # Clean update dirs via ant
+            p = FDroidPopen(['ant', 'clean'], cwd=subdir)
             dparms = parms + ['-p', d]
             if options.verbose:
                 if d == '.':