diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-10-03 00:13:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 00:13:40 +0200 |
| commit | b0194a33f65970948ef66819913bf3034a3a22e8 (patch) | |
| tree | 35e21b53b10bbd525506bb5b72b7f89214e1234f /SConstruct | |
| parent | 5cd68abf8896fd86a33c048d6fece61c3cd3f8e5 (diff) | |
| parent | d5caf71c3fcdeb422d1b0ea97a836fcdb57a8713 (diff) | |
Merge pull request #11739 from neikeq/tengo-el-mono
Moved mono module here
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 8b23b60774..6045be54c7 100644 --- a/SConstruct +++ b/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 |