1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00

Run ant clean in update= dirs instead of removing dirs

This commit is contained in:
Daniel Martí 2014-01-06 12:44:48 +01:00
parent c06b817449
commit 125a36b4de

View File

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