Fixed (hopefully) the depends functionality.
This commit is contained in:
parent
a7c736de56
commit
0a29b41639
@ -367,6 +367,7 @@ def _wrap_depends(depends):
|
|||||||
def _wrapped(env, dependant, dependency):
|
def _wrapped(env, dependant, dependency):
|
||||||
if isinstance(dependant, _Target) or isinstance(dependency, _Target):
|
if isinstance(dependant, _Target) or isinstance(dependency, _Target):
|
||||||
env.Append(SPP_TARGET_DEPENDENCIES = [(dependant, dependency)])
|
env.Append(SPP_TARGET_DEPENDENCIES = [(dependant, dependency)])
|
||||||
|
return
|
||||||
elif isinstance(dependant, dict) and '_target' in dependant:
|
elif isinstance(dependant, dict) and '_target' in dependant:
|
||||||
dependant = dependant['_target']
|
dependant = dependant['_target']
|
||||||
elif isinstance(dependency, dict) and '_target' in dependency:
|
elif isinstance(dependency, dict) and '_target' in dependency:
|
||||||
@ -418,6 +419,12 @@ def _finalize(env: Environment):
|
|||||||
_build_target(target)
|
_build_target(target)
|
||||||
for target in env['SPP_DEFAULT_TARGETS']:
|
for target in env['SPP_DEFAULT_TARGETS']:
|
||||||
env.Default(target.target)
|
env.Default(target.target)
|
||||||
|
for dependant, dependency in env['SPP_TARGET_DEPENDENCIES']:
|
||||||
|
if isinstance(dependant, _Target):
|
||||||
|
dependant = dependant.target
|
||||||
|
if isinstance(dependency, _Target):
|
||||||
|
dependency = dependency.target
|
||||||
|
env.Depends(dependant, dependency)
|
||||||
|
|
||||||
def _get_fallback_cache_dir() -> str:
|
def _get_fallback_cache_dir() -> str:
|
||||||
return Dir('#cache').abspath
|
return Dir('#cache').abspath
|
||||||
|
Loading…
x
Reference in New Issue
Block a user