Better way to set cross_prefix in architectures

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 904e2b49e5524a54434bf9a600c1644264ad2ab0..63f3bba5848c47c4bbaa6c534dd3bb7e9a41d4ab 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -243,8 +243,8 @@ void SourcePackage::create_targets()
 }
 
 
-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 +263,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 +287,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 +322,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 +338,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());
 }