X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9d8a5656935ac02a30581e715455c6bdfb5a5486;hb=0dd3d23846e7fdb729359a57d3f4b190f65aed55;hp=378460d00d968422cc3f618a42baf4436953514c;hpb=5cfcbc7507b14df81018f734ae47f92b231b10d2;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 378460d..9d8a565 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -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,7 +142,6 @@ 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);
@@ -153,10 +152,12 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	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);
+}