FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add distclean compatibility with '--no-lock-in-top' command line option

This commit is contained in:
Adriano Scoditti 2017-08-18 11:08:26 +02:00 committed by ita1024
parent fc021cd060
commit fc468105e9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
waflib/Scripting.py
View File

@ -302,13 +302,19 @@ def distclean_dir(dirname):
def distclean(ctx):
'''removes the build directory'''
lst = os.listdir('.')
refDir = '.'
if getattr(Options.options, 'no_lock_in_top'):
refDir = ctx.options.out
lst = os.listdir(refDir)
for f in lst:
fp = os.path.normpath(os.path.join(refDir, f))
if f == Options.lockfile:
try:
proj = ConfigSet.ConfigSet(f)
proj = ConfigSet.ConfigSet(fp)
except IOError:
Logs.warn('Could not read %r', f)
Logs.warn('Could not read %r', fp)
continue
if proj['out_dir'] != proj['top_dir']:
@ -332,7 +338,7 @@ def distclean(ctx):
if not Options.commands:
for x in '.waf-1. waf-1. .waf3-1. waf3-1.'.split():
if f.startswith(x):
shutil.rmtree(f, ignore_errors=True)
shutil.rmtree(fp, ignore_errors=True)
class Dist(Context.Context):
'''creates an archive containing the project source code'''