Add a way for components to use libraries from the same package

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index f4c63a8dca5e06f71be5153e9c25b2d86194cea6..feb5094b27a071fa8823eabd4e09c2fae466a11d 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -32,7 +32,7 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 
 void Component::prepare()
 {
-       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
                (*i)->prepare();
 }
 
@@ -40,20 +40,20 @@ void Component::create_build_info()
 {
        BuildInfo final_build_info;
 
-       const PackageList &pkg_reqs = package.get_required_packages();
-       PackageList direct_reqs = requires;
+       const Package::Requirements &pkg_reqs = package.get_required_packages();
+       Package::Requirements direct_reqs = requires;
        direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 
-       PackageList all_reqs = direct_reqs;
-       for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+       Package::Requirements all_reqs = direct_reqs;
+       for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
                BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
                if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
                        level = BuildInfo::DEPENDENCY;
                final_build_info.update_from((*i)->get_exported_build_info(), level);
 
-               const PackageList &reqs = (*i)->get_required_packages();
-               for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
+               const Package::Requirements &reqs = (*i)->get_required_packages();
+               for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
                        if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
                                all_reqs.push_back(*j);
        }
@@ -74,7 +74,7 @@ void Component::create_build_info()
 
        if(build_info.libmode<BuildInfo::DYNAMIC)
        {
-               for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+               for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
                {
                        const BuildInfo &ebi = (*i)->get_exported_build_info();
                        build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
@@ -87,7 +87,7 @@ void Component::create_targets() const
        Builder &builder = package.get_builder();
        const Toolchain &toolchain = builder.get_toolchain();
 
-       PathList source_filenames = collect_source_files();
+       SourceList source_filenames = collect_source_files();
        list<Target *> inst_list;
 
        string inst_loc;
@@ -96,7 +96,7 @@ void Component::create_targets() const
                const Tool &tar = toolchain.get_tool("TAR");
 
                list<Target *> files;
-               for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        FileTarget *file = builder.get_vfs().get_target(*i);
                        if(!file)
@@ -126,7 +126,7 @@ void Component::create_targets() const
        else if(type==INSTALL)
        {
                inst_loc = name;
-               for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        FileTarget *ft;
                        if(Target *tgt = builder.get_vfs().get_target(*i))
@@ -155,7 +155,7 @@ void Component::create_targets() const
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
        {
                list<Target *> objs;
-               for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        string ext = FS::extpart(FS::basename(*i));
                        const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
@@ -171,7 +171,7 @@ void Component::create_targets() const
                                        objs.push_back(obj);
                                }
 
-                               if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
+                               if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
                                        inst_list.push_back(src);
                        }
                }
@@ -190,6 +190,24 @@ 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);
@@ -207,10 +225,10 @@ void Component::create_targets() const
        }
 }
 
-PathList Component::collect_source_files() const
+Component::SourceList Component::collect_source_files() const
 {
-       PathList files;
-       for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       SourceList files;
+       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
        {
                FS::Path path(*i);
                if(FS::is_dir(path))
@@ -237,6 +255,7 @@ Component::Loader::Loader(Component &c):
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("default",         &Component::deflt);
+       add("use",             &Loader::use);
 }
 
 void Component::Loader::source(const string &s)
@@ -260,3 +279,15 @@ void Component::Loader::install_map()
 {
        load_sub(obj.install_map, obj.package.get_source_directory());
 }
+
+void Component::Loader::use(const string &n)
+{
+       const SourcePackage::ComponentList &components = obj.package.get_components();
+       for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+               if(i->get_name()==n && i->get_type()==LIBRARY)
+               {
+                       obj.uses.push_back(&*i);
+                       return;
+               }
+       error(format("Unknown library component '%s'", n));
+}