Replace the overly generic configuration profiles with something more purposeful

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index a340f3cc28b00efb091341ad6e3a593f9375e071..3c8749ecb3459defeff2e7fa734d5a8f3e8faebd 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -6,12 +6,12 @@
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
+#include "csourcefile.h"
 #include "datafile.h"
 #include "executable.h"
 #include "file.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
-#include "sourcefile.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
 #include "tarball.h"
@@ -61,9 +61,9 @@ void Component::create_build_info()
 
        build_info.update_from(pkg.get_build_info());
 
-       for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
-       for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
 
        if(pkg.get_library_mode()!=DYNAMIC)
@@ -74,11 +74,6 @@ void Component::create_build_info()
                        build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
                }
        }
-
-       if(type==PROGRAM)
-               build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
-
-       build_info.unique();
 }
 
 void Component::create_targets() const
@@ -125,7 +120,7 @@ void Component::create_targets() const
                /*Target *result = tar.create_target(files, tarname);
 
                Target *tarballs_tgt = builder.get_target("tarballs");
-               tarballs_tgt->add_depend(result);*/
+               tarballs_tgt->add_depend(*result);*/
 
                return;
        }
@@ -154,29 +149,12 @@ void Component::create_targets() const
                Target *result = dcomp.create_target(*source);
 
                if(&pkg==builder.get_main_package() && deflt)
-                       def_tgt->add_depend(result);
+                       def_tgt->add_depend(*result);
                else
-                       world->add_depend(result);
+                       world->add_depend(*result);
                if(install)
                        inst_list.push_back(result);
        }
-       else
-       {
-               for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       string ext = FS::extpart(FS::basename(*i));
-                       if(ext==".h")
-                       {
-                               FileTarget *hdr = builder.get_vfs().get_target(*i);
-                               if(!hdr)
-                                       hdr = new SourceFile(builder, *this, *i);
-
-                               // Install headers if requested
-                               if(type==HEADERS && install)
-                                       inst_list.push_back(hdr);
-                       }
-               }
-       }
 
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
        {
@@ -184,12 +162,18 @@ void Component::create_targets() const
                for(PathList::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);
+                       const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
                        if(tool)
                        {
                                Target *src = tool->create_source(*this, *i);
-                               Target *obj = tool->create_target(*src);
-                               objs.push_back(obj);
+                               if(tool->accepts_suffix(ext))
+                               {
+                                       Target *obj = tool->create_target(*src);
+                                       objs.push_back(obj);
+                               }
+
+                               if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
+                                       inst_list.push_back(src);
                        }
                }
 
@@ -210,9 +194,9 @@ void Component::create_targets() const
                for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
                {
                        if(&pkg==builder.get_main_package() && deflt)
-                               def_tgt->add_depend(*i);
+                               def_tgt->add_depend(**i);
                        else
-                               world->add_depend(*i);
+                               world->add_depend(**i);
                        if(install)
                                inst_list.push_back(*i);
                }
@@ -223,7 +207,7 @@ void Component::create_targets() const
        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_depend(inst);
+               inst_tgt->add_depend(*inst);
        }
 }
 
@@ -248,39 +232,34 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-       comp(c)
+       DataFile::ObjectLoader<Component>(c)
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
+       add("install_map",     &Loader::install_map);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("default",         &Component::deflt);
 }
 
-void Component::Loader::finish()
-{
-       if(!inst_hdr.empty())
-       {
-               Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
-               hdrcomp.sources = comp.sources;
-               hdrcomp.install = true;
-               const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
-       }
-}
-
 void Component::Loader::source(const string &s)
 {
-       comp.sources.push_back(s);
+       obj.sources.push_back(s);
 }
 
 void Component::Loader::require(const string &n)
 {
-       Package *req = comp.pkg.get_builder().get_package(n);
+       Package *req = obj.pkg.get_builder().get_package_manager().find_package(n);
        if(req)
-               comp.requires.push_back(req);
+               obj.requires.push_back(req);
 }
 
 void Component::Loader::build_info()
 {
-       load_sub(comp.build_info);
+       load_sub(obj.build_info);
+}
+
+void Component::Loader::install_map()
+{
+       load_sub(obj.install_map, obj.pkg.get_source());
 }