| ... |
... |
@@ -150,6 +150,7 @@ class Loader(): |
|
150
|
150
|
# Sort direct dependencies of elements by their dependency ordering
|
|
151
|
151
|
#
|
|
152
|
152
|
for element in target_elements:
|
|
|
153
|
+ loader = element._loader
|
|
153
|
154
|
profile_start(Topics.SORT_DEPENDENCIES, element.name)
|
|
154
|
155
|
loader._sort_dependencies(element)
|
|
155
|
156
|
profile_end(Topics.SORT_DEPENDENCIES, element.name)
|
| ... |
... |
@@ -454,7 +455,7 @@ class Loader(): |
|
454
|
455
|
|
|
455
|
456
|
# Descend
|
|
456
|
457
|
for dep in element.dependencies:
|
|
457
|
|
- loader = self._get_loader_for_dep(dep)
|
|
|
458
|
+ loader = dep.element._loader
|
|
458
|
459
|
meta_dep = loader._collect_element(dep.element.name)
|
|
459
|
460
|
if dep.dep_type != 'runtime':
|
|
460
|
461
|
meta_element.build_dependencies.append(meta_dep)
|
| ... |
... |
@@ -576,23 +577,6 @@ class Loader(): |
|
576
|
577
|
|
|
577
|
578
|
return loader
|
|
578
|
579
|
|
|
579
|
|
- # _get_loader_for_dep():
|
|
580
|
|
- #
|
|
581
|
|
- # Gets the appropriate Loader for a Dependency object
|
|
582
|
|
- #
|
|
583
|
|
- # Args:
|
|
584
|
|
- # dep (Dependency): A Dependency object
|
|
585
|
|
- #
|
|
586
|
|
- # Returns:
|
|
587
|
|
- # (Loader): The Loader object to use for this Dependency
|
|
588
|
|
- #
|
|
589
|
|
- def _get_loader_for_dep(self, dep):
|
|
590
|
|
- if dep.element.junction:
|
|
591
|
|
- # junction dependency, delegate to appropriate loader
|
|
592
|
|
- return self._loaders[dep.element.junction.name]
|
|
593
|
|
- else:
|
|
594
|
|
- return self
|
|
595
|
|
-
|
|
596
|
580
|
# _parse_name():
|
|
597
|
581
|
#
|
|
598
|
582
|
# Get junction and base name of element along with loader for the sub-project
|
