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

A more robust way of sorting commands in remote.py

This commit is contained in:
Thomas Nagy 2014-01-30 08:07:07 +01:00
parent 6f18c1bd99
commit c8bc800432
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
waflib/extras/remote.py
View File

@ -125,13 +125,16 @@ class init(Context.Context):
def execute(self):
for x in list(Context.g_module.variants):
self.make_variant(x)
for name in ('configure', 'clean', 'build', 'install'):
if ('%s_all' % name) in Options.commands:
Options.commands.remove('%s_all' % name)
lst = ['remote']
for k in Options.commands:
if k.endswith('_all'):
name = k.replace('_all', '')
for x in Context.g_module.variants:
Options.commands.insert(0, '%s_%s' % (name, x))
Options.commands.insert(0, 'remote')
lst.append('%s_%s' % (name, x))
else:
lst.append(k)
del Options.commands[:]
Options.commands += lst
def make_variant(self, x):
for y in (BuildContext, CleanContext, InstallContext, UninstallContext):
@ -143,6 +146,7 @@ class init(Context.Context):
class tmp(ConfigurationContext):
cmd = 'configure_' + x
fun = 'configure'
variant = x
def __init__(self, **kw):
ConfigurationContext.__init__(self, **kw)
self.setenv(x)