SCons build:
When collecting files for the distribution archive, missing files have been skipped even if named via env.ExtraDist(). Now missing files are skipped only if found by env.DistSourcesOf() . git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@408 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
parent
22240a9365
commit
54ca44f6f7
|
@ -18,7 +18,10 @@ def _e_dist(target, source, env):
|
||||||
if not s.is_derived(): # this node is not built (nor side-effect)
|
if not s.is_derived(): # this node is not built (nor side-effect)
|
||||||
#assert not s.all_children()
|
#assert not s.all_children()
|
||||||
if isinstance(s, Base) and s.is_under(env.fs.Dir('#')):
|
if isinstance(s, Base) and s.is_under(env.fs.Dir('#')):
|
||||||
collected[s] = None
|
if not s.srcnode().exists():
|
||||||
|
print 'warning: file', s.srcnode(), 'is missing'
|
||||||
|
else:
|
||||||
|
collected[s] = None
|
||||||
else:
|
else:
|
||||||
collect_sources(s.all_children(scan=1), collected, done)
|
collect_sources(s.all_children(scan=1), collected, done)
|
||||||
|
|
||||||
|
@ -32,10 +35,6 @@ def _e_dist(target, source, env):
|
||||||
else:
|
else:
|
||||||
collected[s] = None
|
collected[s] = None
|
||||||
collected = [ c.srcnode() for c in collected.keys() ]
|
collected = [ c.srcnode() for c in collected.keys() ]
|
||||||
for c in collected:
|
|
||||||
if not c.exists():
|
|
||||||
print 'warning: file', c, 'is missing'
|
|
||||||
collected = [c for c in collected if c.exists()]
|
|
||||||
collected.sort(cmp_path)
|
collected.sort(cmp_path)
|
||||||
return (target, collected)
|
return (target, collected)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue