mirror of
https://gitlab.com/ita1024/waf.git
synced 2024-11-22 01:46:15 +01:00
When creating the waf script, assume that the 'extras' folder only contains Python files
Files are also listed in a static arbitrary order.
This commit is contained in:
parent
4ed9af0ee9
commit
2e58ac4134
25
wscript
25
wscript
@ -258,20 +258,19 @@ def create_waf(self, *k, **kw):
|
|||||||
for x in Options.options.coretools.split(','):
|
for x in Options.options.coretools.split(','):
|
||||||
coretools.append(x + '.py')
|
coretools.append(x + '.py')
|
||||||
|
|
||||||
for d in '. Tools extras'.split():
|
up_node = self.generator.bld.path
|
||||||
dd = os.path.join('waflib', d)
|
for node in up_node.find_dir('waflib').ant_glob(incl=['*.py', 'Tools/*.py', 'extras/*.py']):
|
||||||
for k in os.listdir(dd):
|
relpath = node.path_from(up_node)
|
||||||
if k == '__init__.py':
|
if node.name == '__init__.py':
|
||||||
files.append(os.path.normpath(os.path.join(dd, k)))
|
files.append(relpath)
|
||||||
|
continue
|
||||||
|
if node.parent.name == 'Tools' and Options.options.coretools != 'default':
|
||||||
|
if node.name not in coretools:
|
||||||
continue
|
continue
|
||||||
if d == 'Tools' and Options.options.coretools != 'default':
|
if node.parent.name == 'extras':
|
||||||
if not k in coretools:
|
if node.name not in add3rdparty:
|
||||||
continue
|
continue
|
||||||
if d == 'extras':
|
files.append(relpath)
|
||||||
if not k in add3rdparty:
|
|
||||||
continue
|
|
||||||
if k.endswith('.py'):
|
|
||||||
files.append(os.path.normpath(os.path.join(dd, k)))
|
|
||||||
|
|
||||||
if Options.options.namesfrom:
|
if Options.options.namesfrom:
|
||||||
with tarfile.open(Options.options.namesfrom) as tar:
|
with tarfile.open(Options.options.namesfrom) as tar:
|
||||||
|
Loading…
Reference in New Issue
Block a user