Rename BuildInfo::add to update_from

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 24dce7739d47bb34c947312eaeacda44816fdab2..1eb93ceeee357a80501643d8d0053ae07edbaf8f 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -10,7 +10,6 @@
 #include "executable.h"
 #include "file.h"
 #include "header.h"
-#include "install.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -50,7 +49,7 @@ void Component::create_build_info()
        for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
                if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
-                       build_info.add((*i)->get_exported_binfo());
+                       build_info.update_from((*i)->get_exported_binfo());
                else
                {
                        const BuildInfo &ebi = (*i)->get_exported_binfo();
@@ -65,7 +64,7 @@ void Component::create_build_info()
                                all_reqs.push_back(*j);
        }
 
-       build_info.add(pkg.get_build_info());
+       build_info.update_from(pkg.get_build_info());
 
        for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
@@ -120,7 +119,7 @@ void Component::create_targets() const
                list<Target *> files;
                for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
-                       FileTarget *file = builder.get_target_by_path(*i);
+                       FileTarget *file = builder.get_vfs().get_target(*i);
                        if(!file)
                                file = new File(builder, *i);
                        files.push_back(file);
@@ -149,7 +148,7 @@ void Component::create_targets() const
                for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        FileTarget *ft;
-                       if(Target *tgt = builder.get_target_by_path(*i))
+                       if(Target *tgt = builder.get_vfs().get_target(*i))
                                ft = dynamic_cast<FileTarget *>(tgt);
                        else
                                ft = new File(builder, pkg, *i);
@@ -161,7 +160,7 @@ void Component::create_targets() const
                const Tool &dcomp = toolchain.get_tool("DATA");
 
                File *source;
-               if(Target *tgt = builder.get_target_by_path(source_filenames.front()))
+               if(Target *tgt = builder.get_vfs().get_target(source_filenames.front()))
                        source = dynamic_cast<File *>(tgt);
                else
                        source = new File(builder, pkg, source_filenames.front());
@@ -181,7 +180,7 @@ void Component::create_targets() const
                        string ext = FS::extpart(FS::basename(*i));
                        if(ext==".h")
                        {
-                               FileTarget *hdr = builder.get_target_by_path(*i);
+                               FileTarget *hdr = builder.get_vfs().get_target(*i);
                                if(!hdr)
                                        hdr = new Header(builder, *this, i->str());