Externalize dry run handling from Config and DependencyCache

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index d66a36fb4b247c289db1825df1f8c2e667fb7543..456acfd6af1e0f37505a6973c3ce20e8bd0f3764 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -53,9 +53,7 @@ unsigned SourcePackage::get_install_flags()
                        if(i->get_type()==Component::PROGRAM)
                                flags |= BIN;
                        else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-                               flags |= LIB;
-                       else if(i->get_type()==Component::HEADERS)
-                               flags |= INCLUDE;
+                               flags |= LIB|INCLUDE;
                }
 
        return flags;
@@ -129,12 +127,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
                config.select_last_profile();
 
        if(flag && config.update(opts))
-       {
-               if(builder.get_verbose()>=2)
-                       IO::print("Configuration of %s changed\n", name);
-               if(!builder.get_dry_run())
-                       config.save();
-       }
+               builder.get_logger().log("configure", format("Configuration of %s changed", name));
 
        config.finish();
 
@@ -234,20 +227,26 @@ void SourcePackage::create_targets()
        for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
        {
                i->create_targets();
-               if(i->get_type()==Component::LIBRARY || i->get_type()==Component::HEADERS)
+               if(i->get_type()==Component::LIBRARY)
                        pc_needed = true;
        }
 
        if(pc_needed)
        {
                PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-               builder.get_target("install")->add_depend(builder.get_toolchain().get_tool("CP").create_target(*pc));
+               builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
        }
 }
 
+void SourcePackage::save_caches()
+{
+       config.save();
+       deps_cache.save();
+}
+
 
-SourcePackage::Loader::Loader(Package &p):
-       Package::Loader(p)
+SourcePackage::Loader::Loader(SourcePackage &p):
+       DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
 {
        add("version",     &SourcePackage::version);
        add("description", &SourcePackage::description);
@@ -257,7 +256,7 @@ SourcePackage::Loader::Loader(Package &p):
        add("program",     &Loader::component<Component::PROGRAM>);
        add("library",     &Loader::component<Component::LIBRARY>);
        add("module",      &Loader::component<Component::MODULE>);
-       add("headers",     &Loader::component<Component::HEADERS>);
+       add("headers",     &Loader::headers);
        add("install",     &Loader::component<Component::INSTALL>);
        add("datafile",    &Loader::component<Component::DATAFILE>);
        add("tarball",     &Loader::tarball);
@@ -266,8 +265,22 @@ SourcePackage::Loader::Loader(Package &p):
 
 void SourcePackage::Loader::finish()
 {
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-       spkg.components.sort(component_sort);
+       obj.components.sort(component_sort);
+
+       for(map<string, string>::const_iterator i=install_map.begin(); i!=install_map.end(); ++i)
+       {
+               for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j)
+               {
+                       const StringList &sources = j->get_sources();
+                       for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
+                       {
+                               if(!i->first.compare(0, k->size(), *k))
+                               {
+                                       const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source/i->first, i->second);
+                               }
+                       }
+               }
+       }
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
@@ -276,43 +289,50 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
        feat.descr = d;
        feat.def_value = "no";
        load_sub(feat);
-       static_cast<SourcePackage &>(pkg).features.push_back(feat);
+       obj.features.push_back(feat);
 }
 
 void SourcePackage::Loader::condition(const string &c)
 {
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-       Condition cond(spkg, c);
+       Condition cond(obj, c);
        load_sub(cond);
-       spkg.conditions.push_back(cond);
+       obj.conditions.push_back(cond);
 }
 
 template<Component::Type t>
 void SourcePackage::Loader::component(const string &n)
 {
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-       Component comp(spkg, t, n);
+       Component comp(obj, t, n);
        load_sub(comp);
-       spkg.components.push_back(comp);
+       obj.components.push_back(comp);
 }
 
 void SourcePackage::Loader::build_info()
 {
-       load_sub(static_cast<SourcePackage &>(pkg).build_info);
+       load_sub(obj.build_info);
+}
+
+void SourcePackage::Loader::headers(const string &n)
+{
+       IO::print("%s: Note: headers components are deprecated\n", get_source());
+       Component comp(obj, Component::LIBRARY, n);
+       load_sub(comp);
+       const StringList &sources = comp.get_sources();
+       for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+               install_map[*i] = "include/"+comp.get_name();
 }
 
 void SourcePackage::Loader::tarball(const string &n)
 {
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
        if(n=="@src")
        {
-               for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+               for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
                        if(i->get_type()==Component::TARBALL && i->get_name()==n)
                                load_sub(*i);
        }
        else
        {
-               Component trbl(spkg, Component::TARBALL, n);
+               Component trbl(obj, Component::TARBALL, n);
                load_sub(trbl);
        }
 }
@@ -320,8 +340,7 @@ void SourcePackage::Loader::tarball(const string &n)
 void SourcePackage::Loader::tar_file(const string &f)
 {
        IO::print("%s: Note: tar_file is deprecated\n", get_source());
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-       for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+       for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
                if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
-                       const_cast<StringList &>(i->get_sources()).push_back((spkg.source/f).str());
+                       const_cast<StringList &>(i->get_sources()).push_back((obj.source/f).str());
 }