Fix SConstruct check for config.is_enabled()
This commit is contained in:
parent
e36fb95c50
commit
d5caf71c3f
1 changed files with 6 additions and 7 deletions
13
SConstruct
13
SConstruct
|
@ -192,13 +192,12 @@ for x in module_list:
|
|||
module_enabled = True
|
||||
tmppath = "./modules/" + x
|
||||
sys.path.append(tmppath)
|
||||
try:
|
||||
import config
|
||||
if (not config.is_enabled()):
|
||||
module_enabled = False
|
||||
except:
|
||||
pass
|
||||
import config
|
||||
enabled_attr = getattr(config, "is_enabled", None)
|
||||
if (callable(enabled_attr) and not config.is_enabled()):
|
||||
module_enabled = False
|
||||
sys.path.remove(tmppath)
|
||||
sys.modules.pop('config')
|
||||
opts.Add(BoolVariable('module_' + x + '_enabled', "Enable module '%s'" % (x, ), module_enabled))
|
||||
|
||||
opts.Update(env_base) # update environment
|
||||
|
@ -246,7 +245,7 @@ if selected_platform in platform_list:
|
|||
env = detect.create(env_base)
|
||||
else:
|
||||
env = env_base.Clone()
|
||||
|
||||
|
||||
if env['dev']:
|
||||
env["warnings"] = "all"
|
||||
env['verbose'] = True
|
||||
|
|
Loading…
Reference in a new issue