|
@@ -192,13 +192,12 @@ for x in module_list:
|
|
module_enabled = True
|
|
module_enabled = True
|
|
tmppath = "./modules/" + x
|
|
tmppath = "./modules/" + x
|
|
sys.path.append(tmppath)
|
|
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.path.remove(tmppath)
|
|
|
|
+ sys.modules.pop('config')
|
|
opts.Add(BoolVariable('module_' + x + '_enabled', "Enable module '%s'" % (x, ), module_enabled))
|
|
opts.Add(BoolVariable('module_' + x + '_enabled', "Enable module '%s'" % (x, ), module_enabled))
|
|
|
|
|
|
opts.Update(env_base) # update environment
|
|
opts.Update(env_base) # update environment
|
|
@@ -246,7 +245,7 @@ if selected_platform in platform_list:
|
|
env = detect.create(env_base)
|
|
env = detect.create(env_base)
|
|
else:
|
|
else:
|
|
env = env_base.Clone()
|
|
env = env_base.Clone()
|
|
-
|
|
|
|
|
|
+
|
|
if env['dev']:
|
|
if env['dev']:
|
|
env["warnings"] = "all"
|
|
env["warnings"] = "all"
|
|
env['verbose'] = True
|
|
env['verbose'] = True
|