maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix SConstruct check for config.is_enabled()

Browse source
This commit is contained in:
Ignacio Etcheverry 2017-10-03 00:01:15 +02:00
parent e36fb95c50
commit d5caf71c3f
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -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
import config enabled_attr = getattr(config, "is_enabled", None)
if (not config.is_enabled()): if (callable(enabled_attr) and not config.is_enabled()):
module_enabled = False module_enabled = False
except:
pass
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