Refactor build graph into its own class

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 68c9b1800097ad6ef014ae5b5a86122e52d392cf..d1849f4027ead3b480af4db82294537fe0d7d124 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -104,6 +104,7 @@ void Component::create_build_info()
 void Component::create_targets() const
 {
        Builder &builder = package.get_builder();
+       BuildGraph &build_graph = builder.get_build_graph();
        const Toolchain &toolchain = builder.get_toolchain();
 
        SourceList source_filenames = collect_source_files();
@@ -128,8 +129,8 @@ void Component::create_targets() const
                        tarname = package.get_name()+"-"+package.get_version();
                        files.insert(files.begin(), &package.get_build_file());
 
-                       const Builder::TargetMap &targets = builder.get_targets();
-                       for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+                       const BuildGraph::TargetMap &targets = build_graph.get_targets();
+                       for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
                                if(i->second->get_package()==&package && !i->second->is_buildable())
                                        if(find(files.begin(), files.end(), i->second)==files.end())
                                                files.push_back(i->second);
@@ -137,13 +138,13 @@ void Component::create_targets() const
 
                Target *result = tar.create_target(files, tarname);
 
-               builder.get_target("tarballs")->add_dependency(*result);
+               build_graph.get_target("tarballs")->add_dependency(*result);
 
                return;
        }
        else if(type==INSTALL)
        {
-               Target *inst = builder.get_target("install");
+               Target *inst = build_graph.get_target("install");
                const Tool &copy = toolchain.get_tool("CP");
                for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
@@ -166,9 +167,9 @@ void Component::create_targets() const
                        source = new File(builder, package, source_filenames.front());
                Target *result = dcomp.create_target(*source);
 
-               builder.add_primary_target(*result);
+               build_graph.add_primary_target(*result);
                if(install)
-                       builder.add_installed_target(*result);
+                       build_graph.add_installed_target(*result);
        }
 
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
@@ -191,7 +192,7 @@ void Component::create_targets() const
                                }
 
                                if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-                                       builder.add_installed_target(*src);
+                                       build_graph.add_installed_target(*src);
                        }
                }
 
@@ -211,9 +212,9 @@ void Component::create_targets() const
 
                for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
                {
-                       builder.add_primary_target(**i);
+                       build_graph.add_primary_target(**i);
                        if(install)
-                               builder.add_installed_target(**i);
+                               build_graph.add_installed_target(**i);
                }
        }
 }