DataFile::DerivedObjectLoader was changed

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index e74c0b7540c409fd07e0ed3048dd7ee167da3be4..6eaba739586881eac93f183eeb66ad49ce13c00a 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -6,7 +6,6 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "file.h"
-#include "misc.h"
 #include "pkgconfigfile.h"
 #include "tool.h"
 #include "sourcepackage.h"
@@ -68,7 +67,7 @@ FS::Path SourcePackage::get_out_dir() const
                return source_dir/arch.get_name();
 }
 
-void SourcePackage::create_build_info()
+void SourcePackage::do_prepare()
 {
        BuildInfo final_build_info;
 
@@ -103,10 +102,7 @@ void SourcePackage::create_build_info()
                export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
                export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
        }
-}
 
-void SourcePackage::create_targets()
-{
        cache.load();
 
        bool pc_needed = false;
@@ -132,13 +128,13 @@ void SourcePackage::save_caches()
 
 
 SourcePackage::Loader::Loader(SourcePackage &p):
-       DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+       DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
 {
        init(0);
 }
 
 SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
-       DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+       DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
 {
        init(&o);
 }
@@ -151,8 +147,7 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
        add("build_info",  &Loader::build_info);
        add("feature",     &Loader::feature);
        add("if",          &Loader::condition);
-       add("if_arch",     &Loader::if_arch);
-       add("if_feat",     &Loader::if_feature);
+       add("if_feature",  &Loader::if_feature);
        add("program",     &Loader::component<Component::PROGRAM>);
        add("library",     &Loader::component<Component::LIBRARY>);
        add("module",      &Loader::component<Component::MODULE>);
@@ -172,10 +167,11 @@ void SourcePackage::Loader::finish()
        {
                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)
+                       const Component::SourceList &sources = j->get_sources();
+                       for(Component::SourceList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
                        {
-                               if(!i->first.compare(0, k->size(), *k))
+                               string k_str = k->str();
+                               if(!i->first.compare(0, k_str.size(), k_str))
                                {
                                        const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second);
                                }
@@ -227,19 +223,9 @@ 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::if_arch(const string &cond)
-{
-       const Architecture &arch = obj.builder.get_current_arch();
-       bool negate = (cond[0]=='!');
-       bool match = (arch.match_name(cond.substr(negate))!=negate);
-       obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
-       if(match)
-               load_sub_with(*this);
+       const Component::SourceList &sources = comp.get_sources();
+       for(Component::SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+               install_map[i->str()] = "include/"+comp.get_name();
 }
 
 void SourcePackage::Loader::if_feature(const string &cond)
@@ -292,5 +278,5 @@ void SourcePackage::Loader::tar_file(const string &f)
        IO::print("%s: Note: tar_file is deprecated\n", get_source());
        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((obj.source_dir/f).str());
+                       const_cast<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
 }