Move some more functionality into BuildGraph

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 8a57b6410ee47024cec0b88704f9998707130a4b..d1849f4027ead3b480af4db82294537fe0d7d124 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -79,6 +79,12 @@ void Component::create_build_info()
                for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
                        base = FS::common_ancestor(base, *j);
                build_info.incpath.push_back(base);
+               build_info.libs.push_back((*i)->get_name());
+               if(!(*i)->get_install())
+               {
+                   build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+                       build_info.libpath.push_back((*i)->get_package().get_source_directory());
+               }
        }
 
        if(type==LIBRARY || type==MODULE)
@@ -98,10 +104,10 @@ 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();
-       list<Target *> inst_list;
 
        string inst_loc;
        if(type==TARBALL)
@@ -123,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);
@@ -132,13 +138,14 @@ 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)
        {
-               inst_loc = name;
+               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)
                {
                        FileTarget *ft;
@@ -146,7 +153,7 @@ void Component::create_targets() const
                                ft = dynamic_cast<FileTarget *>(tgt);
                        else
                                ft = new File(builder, package, *i);
-                       inst_list.push_back(ft);
+                       inst->add_dependency(*copy.create_target(*ft, name));
                }
        }
        else if(type==DATAFILE)
@@ -160,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)
-                       inst_list.push_back(result);
+                       build_graph.add_installed_target(*result);
        }
 
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
@@ -185,7 +192,7 @@ void Component::create_targets() const
                                }
 
                                if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-                                       inst_list.push_back(src);
+                                       build_graph.add_installed_target(*src);
                        }
                }
 
@@ -203,39 +210,13 @@ void Component::create_targets() const
                else
                        results.push_back(linker.create_target(objs));
 
-               const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies();
-               for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
-               {
-                       /* The world target depends on all primary targets; look for the
-                       static library belonging to the component.  This is a bit roundabout
-                       way but gets the job done. */
-                       bool found = false;
-                       for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j)
-                               if((*j)->get_component()==*i && dynamic_cast<StaticLibrary *>(*j))
-                               {
-                                       results.front()->add_dependency(**j);
-                                       found = true;
-                                       break;
-                               }
-                       if(!found)
-                               builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name));
-               }
-
                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)
-                               inst_list.push_back(*i);
+                               build_graph.add_installed_target(**i);
                }
        }
-
-       Target *inst_tgt = builder.get_target("install");
-       const Tool &copy = toolchain.get_tool("CP");
-       for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-       {
-               Target *inst = copy.create_target(**i, inst_loc);
-               inst_tgt->add_dependency(*inst);
-       }
 }
 
 Component::SourceList Component::collect_source_files() const
@@ -302,5 +283,5 @@ void Component::Loader::use(const string &n)
                        obj.uses.push_back(&*i);
                        return;
                }
-       error(format("Unknown library component '%s'", n));
+       throw invalid_argument("Component::Loader::use");
 }