Extended cpp_info model object to new components concept

conans/model/build_info.py

@@ -55,22 +55,24 @@ def _sorted_components(self):
         Sorted components from less dependent to the most one
         :return: ordered list of components
         """
-        # Sort first elements with less items in .deps attribute
-        comps = sorted(self._components.values(), key=lambda component: len(component.deps))
         # Save name of unsorted elements
-        unsorted_names = [comp.name for comp in comps]
-
+        unsorted_names = list(self._components.keys())
         sorted_comps = []
+        element = unsorted_names[0]
         while unsorted_names:
-            for comp in comps:
-                # If element is already sorted, continue
-                if comp.name not in unsorted_names:
-                    continue
-                # If element does not have deps or all of its deps are already sorted, sort this
-                # element and remove it from the unsorted list
-                elif not comp.deps or not [dep for dep in comp.deps if dep in unsorted_names]:
-                    sorted_comps.append(comp)
-                    unsorted_names.remove(comp.name)
+            try:
+                deps = self._components[element].deps
+            except KeyError as e:
+                raise ConanException("Component %s not found in cpp_info object" % e)
+            if all(dep in [c.name for c in sorted_comps] for dep in deps):
+                sorted_comps.append(self._components[element])
+                unsorted_names.remove(element)
+                element = unsorted_names[0] if unsorted_names else None
+            else:
+                for dep in deps:
+                    if dep not in [c.name for c in sorted_comps]:
+                        element = dep
+                        break
         return sorted_comps
 
     @property
@@ -156,7 +158,7 @@ def _get_paths(self, path_name):
         result = []
 
         if self._components:
-            for dep_value in self._components.values():
+            for dep_value in self._sorted_components:
                 abs_paths = self._filter_paths(getattr(dep_value, "%s_paths" % path_name))
                 for path in abs_paths:
                     if path not in result:

conans/test/integration/package_info_test.py

@@ -243,8 +243,9 @@ def build(self):
             expected_comp_iss_library_paths
         expected_global_binary_paths = expected_comp_starlight_binary_paths
         expected_global_libs = expected_comp_starlight_system_deps + [expected_comp_starlight_lib]
-        expected_global_libs.extend(expected_comp_launcher_system_deps)
+        expected_global_libs.extend(expected_comp_planet_system_deps)
         expected_global_libs.append(expected_comp_planet_lib)
+        expected_global_libs.extend(expected_comp_launcher_system_deps)
         expected_global_libs.extend(expected_comp_iss_system_deps)
         expected_global_libs.append(expected_comp_iss_lib)
         expected_global_exes = [expected_comp_launcher_exe]

conans/test/unittests/model/build_info_test.py

@@ -221,7 +221,7 @@ def cpp_info_system_deps_test(self):
         info["LIB2"].system_deps = ["sys2"]
         info["LIB1"].deps = ["LIB3"]
         info["LIB3"].system_deps = ["sys3", "sys2"]
-        self.assertEqual(['sys2', 'sys3', 'sys1', 'sys11'], info.libs)
+        self.assertEqual(['sys3', 'sys2', 'sys1', 'sys11'], info.libs)
         info["LIB3"].system_deps = [None, "sys2"]
         self.assertEqual(['sys2', 'sys1', 'sys11'], info.libs)
 
@@ -241,15 +241,16 @@ def cpp_info_libs_system_deps_order_test(self):
         info["LIB1"].deps = ["LIB2"]
         info["LIB2"].lib = "lib2"
         info["LIB2"].system_deps = ["sys2"]
-        info["LIB1"].deps = ["LIB3"]
+        info["LIB2"].deps = ["LIB3"]
         info["LIB3"].lib = "lib3"
         info["LIB3"].system_deps = ["sys3", "sys2"]
-        self.assertEqual(['sys2', 'lib2', 'sys3', 'lib3', 'sys1', 'sys11', 'lib1'], info.libs)
-        self.assertEqual(['sys2', 'sys3', 'sys1', 'sys11'], info.system_deps)
+        self.assertEqual(['sys3', 'sys2', 'lib3', 'lib2', 'sys1', 'sys11', 'lib1'], info.libs)
+        self.assertEqual(['sys3', 'sys2', 'sys1', 'sys11'], info.system_deps)
 
     def cpp_info_link_order_test(self):
 
         def _assert_link_order(sorted_libs):
+            assert sorted_libs, "'sorted_libs' is empty"
             for num, lib in enumerate(sorted_libs):
                 component_name = lib[-1]
                 for dep in info[component_name].deps:
@@ -297,6 +298,14 @@ def _assert_link_order(sorted_libs):
         info["B"].deps = []
         _assert_link_order(info.libs)
 
+    def cppinfo_inexistent_component_dep_test(self):
+        info = CppInfo(None)
+        info["LIB1"].lib = "lib1"
+        info["LIB1"].deps = ["LIB2"]
+        with six.assertRaisesRegex(self, ConanException, "Component 'LIB2' not found in cpp_info "
+                                                         "object"):
+            info.libs
+
     def cppinfo_dirs_test(self):
         folder = temp_folder()
         info = CppInfo(folder)