mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be more consistent when doing cleans

Browse source 
All update dirs, including ., will remove baddirs.
Right before build=, (ant|maven|gradle) clean will run
This commit is contained in:
Daniel Martí 2013-10-10 15:48:39 +02:00
parent 87fd0d69d1
commit 0bde32fd99
2 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
fdroidserver/common.py
View file

@ -1229,14 +1229,27 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
if os.path.exists(buildxml):
print 'Force-removing old build.xml'
os.remove(buildxml)
for baddir in [
'gen', 'bin', 'obj', # ant
'libs/armeabi-v7a', 'libs/armeabi', # jni
'libs/mips', 'libs/x86', # jni
'build', # gradle
'target']: # maven
badpath = os.path.join(build_dir, baddir)
if os.path.exists(badpath):
print "Removing '%s'" % badpath
shutil.rmtree(badpath)
for d in update_dirs:
cwd = os.path.join(root_dir, d)
# Remove gen and bin dirs in libraries
# rid of them...
for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']:
for baddir in [
'gen', 'bin', 'obj', # ant
'libs/armeabi-v7a', 'libs/armeabi', # jni
'libs/mips', 'libs/x86']:
badpath = os.path.join(cwd, baddir)
if os.path.exists(badpath):
print "Removing %s in update dir %s" % (badpath, d)
print "Removing '%s'" % badpath
shutil.rmtree(badpath)
if verbose:
print "Update of '%s': exec '%s' in '%s'"%\
@ -1372,14 +1385,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
if basesrclib:
srclibpaths.append(basesrclib)
# There should never be bin, gen or native libs directories in the source, so just get
# rid of them...
for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']:
badpath = os.path.join(root_dir, baddir)
if os.path.exists(badpath):
print "Removing %s" % badpath
shutil.rmtree(badpath)
# Apply patches if any
if 'patch' in build:
for patch in build['patch'].split(';'):