Make Target::build virtual and move the unlink call to FileTarget

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 904e2b49e5524a54434bf9a600c1644264ad2ab0..02e9152a7b3ef52abcf5042bcf41d56516b7ac0a 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -44,21 +44,6 @@ FS::Path SourcePackage::get_out_dir() const
                return source/arch.get_name()/config.get_option("outdir").value;
 }
 
-unsigned SourcePackage::get_install_flags()
-{
-       unsigned flags = 0;
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-               if(i->get_install())
-               {
-                       if(i->get_type()==Component::PROGRAM)
-                               flags |= BIN;
-                       else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-                               flags |= LIB|INCLUDE;
-               }
-
-       return flags;
-}
-
 LibMode SourcePackage::get_library_mode() const
 {
        const string &mode = config.get_option("staticlibs").value;
@@ -127,11 +112,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
                config.select_last_profile();
 
        if(flag && config.update(opts))
-       {
                builder.get_logger().log("configure", format("Configuration of %s changed", name));
-               if(!builder.get_dry_run())
-                       config.save();
-       }
 
        config.finish();
 
@@ -184,15 +165,18 @@ void SourcePackage::create_build_info()
        const StringList &warnings = builder.get_warnings();
        build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
 
-       unsigned flags = get_install_flags();
-
        build_info.incpath.push_back((builder.get_prefix()/"include").str());
        build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-       if(flags&INCLUDE)
+       bool export_paths = false;
+       for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
+               export_paths = (i->get_type()==Component::LIBRARY);
+
+       if(export_paths)
+       {
                export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-       if(flags&LIB)
                export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+       }
 
        string optimize = config.get_option("optimize").value;
        if(!optimize.empty() && optimize!="0")
@@ -238,13 +222,19 @@ void SourcePackage::create_targets()
        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);
@@ -263,19 +253,18 @@ 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=spkg.components.begin(); j!=spkg.components.end(); ++j)
+               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(spkg.source/i->first, i->second);
+                                       const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source/i->first, i->second);
                                }
                        }
                }
@@ -288,36 +277,33 @@ 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());
-       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-       Component comp(spkg, Component::LIBRARY, n);
+       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)
@@ -326,16 +312,15 @@ void SourcePackage::Loader::headers(const string &n)
 
 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);
        }
 }
@@ -343,8 +328,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());
 }