X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9d8a5656935ac02a30581e715455c6bdfb5a5486;hb=486adc75285b8b5d62a990dd9f9cd4737c8ab7f6;hp=77440d6057112bf013a41c1b221ff7b924a6372c;hpb=592fa2bca4e973678cbdc86802fe1c151b40e04d;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 77440d6..9d8a565 100644
--- 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"
@@ -129,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);
 }
@@ -143,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()
@@ -168,10 +168,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);
 				}
@@ -223,9 +224,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();
+	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)
@@ -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);
@@ -278,5 +286,16 @@ 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());
+}
+
+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);
 }