[rbuild] Remove distinction between Iso/IsoRegTest, and LiveIso/LiveIsoRegTest module...

[reactos.git] / reactos / tools / rbuild / backend / dependencymap / dependencymap.cpp

diff --git a/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
index b9a9b1e..18fa279 100644 (file)
--- a/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
+++ b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
@@ -50,7 +50,7 @@ static class DepMapFactory : public Backend::Factory
                {\r
                        return new DepMapBackend(project, configuration);\r
                }\r
-               \r
+\r
 } factory;\r
 \r
 \r
@@ -94,13 +94,11 @@ DepMapBackend::_generate_depmap ( FILE* OUT )
        typedef map<string, module_data*> ModuleMap;\r
        ModuleMap module_map;\r
 \r
-       for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
+       for( std::map<std::string, Module*>::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p )\r
        {\r
-               Module& module = *ProjectNode.modules[i];\r
-               if ((module.type != Iso) && \r
-                       (module.type != LiveIso) &&\r
-                       (module.type != IsoRegTest) &&\r
-                       (module.type != LiveIsoRegTest))\r
+               Module& module = *p->second;\r
+               if ((module.type != Iso) &&\r
+                       (module.type != LiveIso))\r
                {\r
                        vector<const IfableData*> ifs_list;\r
                        ifs_list.push_back ( &module.project.non_if_data );\r
@@ -128,7 +126,7 @@ DepMapBackend::_generate_depmap ( FILE* OUT )
                                for ( size_t j = 0; j < libs.size(); j++ )\r
                                {\r
                                        ModuleMap::iterator it = module_map.find ( libs[j]->name );\r
-                                       \r
+\r
                                        if ( it != module_map.end ())\r
                                        {\r
                                                module_data * data = it->second;\r
@@ -146,30 +144,30 @@ DepMapBackend::_generate_depmap ( FILE* OUT )
                                        current_data->libraries.push_back ( libs[j]->name );\r
                                }\r
                        }\r
-               }       \r
+               }\r
        }\r
-       \r
+\r
        fprintf ( m_DepMapFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" );\r
        fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" );\r
        fprintf ( m_DepMapFile, "<components>\r\n" );\r
 \r
-       for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
+       for( std::map<std::string, Module*>::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p )\r
        {\r
-               Module& module = *ProjectNode.modules[i];\r
-               \r
+               Module& module = *p->second;\r
+\r
                ModuleMap::iterator it = module_map.find ( module.name );\r
                if ( it != module_map.end () )\r
                {\r
                        module_data * data = it->second;\r
-                       \r
-                       \r
+\r
+\r
 \r
                        fprintf ( m_DepMapFile, "\t<component>\r\n" );\r
                        fprintf ( m_DepMapFile, "\t\t<name>%s</name>\r\n", module.name.c_str () );\r
-                       fprintf ( m_DepMapFile, "\t\t<base>%s</base>\r\n", module.GetBasePath ().c_str () );\r
+                       fprintf ( m_DepMapFile, "\t\t<base>%s</base>\r\n", module.output->relative_path.c_str () );\r
                        fprintf ( m_DepMapFile, "\t\t<ref_count>%u</ref_count>\r\n", (unsigned int)data->references.size () );\r
                        fprintf ( m_DepMapFile, "\t\t<lib_count>%u</lib_count>\r\n", (unsigned int)data->libraries.size () );\r
-#if 0                  \r
+#if 0\r
                        if ( data->references.size () )\r
                        {\r
                                fprintf ( m_DepMapFile, "\t<references>\r\n" );\r
@@ -179,7 +177,7 @@ DepMapBackend::_generate_depmap ( FILE* OUT )
                                }\r
                                fprintf ( m_DepMapFile, "\t</references>\r\n" );\r
                        }\r
-                       \r
+\r
                        if ( data->libraries.size () )\r
                        {\r
                                fprintf ( m_DepMapFile, "\t<libraries>\r\n" );\r