Refactor build graph into its own class

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1c5ca246fcf8cbcdb0ff521da013723e4a0217ad..8ad12d37c7f78ccc533e4366df613709c637902e 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -116,7 +116,7 @@ void SourcePackage::do_prepare()
        if(pc_needed)
        {
                PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-               builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+               builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
        }
 }
 
@@ -128,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);
 }
@@ -142,21 +142,22 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
        options = o;
-       add("version",     &SourcePackage::version);
        add("description", &SourcePackage::description);
        add("build_info",  &Loader::build_info);
        add("feature",     &Loader::feature);
        add("if",          &Loader::condition);
-       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>);
        add("headers",     &Loader::headers);
        add("install",     &Loader::component<Component::INSTALL>);
+       add("interface_version", &Loader::interface_version);
        add("datafile",    &Loader::component<Component::DATAFILE>);
        add("source_tarball", &Loader::source_tarball);
        add("tarball",     &Loader::tarball);
        add("tar_file",    &Loader::tar_file);
+       add("version",     &Loader::version);
 }
 
 void SourcePackage::Loader::finish()
@@ -235,7 +236,7 @@ void SourcePackage::Loader::if_feature(const string &cond)
        if(equals!=string::npos)
        {
                if(equals==0)
-                       error("No feature name specified");
+                       throw invalid_argument("SourcePackage::Loader::if_feature");
                bool negate = cond[equals-1]=='!';
                string name = cond.substr(0, equals-negate);
                string value = obj.config.get_option("with_"+name).value;
@@ -254,6 +255,13 @@ void SourcePackage::Loader::if_feature(const string &cond)
                load_sub_with(*this);
 }
 
+void SourcePackage::Loader::interface_version(const string &v)
+{
+       obj.interface_version = v;
+       if(obj.version.empty())
+               obj.version = v;
+}
+
 void SourcePackage::Loader::source_tarball()
 {
        load_sub(*obj.source_tarball);
@@ -280,3 +288,14 @@ void SourcePackage::Loader::tar_file(const string &f)
                if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
                        const_cast<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
 }
+
+void SourcePackage::Loader::version(const string &v)
+{
+       obj.version = v;
+
+       string::size_type i = 0;
+       for(unsigned dots=0; i<obj.version.size(); ++i)
+               if(obj.version[i]=='.' && ++dots>=2)
+                       break;
+       obj.interface_version = obj.version.substr(0, i);
+}