X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=274230076599f9a78e890514126dbdedc9e5a3ce;hb=276a7c7c046a8f1b692cecbd53f17595ed23264d;hp=dbb759205fe0eef45f3b0b1ded50cfe5ba80a077;hpb=64661ac00a3a7eaa2295b85be642b6c96276cf97;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index dbb7592..2742300 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,27 +1,26 @@
+#include <algorithm>
 #include <cstdlib>
+#include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "binarycomponent.h"
 #include "binarypackage.h"
+#include "booleanevaluator.h"
 #include "builder.h"
+#include "datapackcomponent.h"
 #include "file.h"
+#include "installcomponent.h"
 #include "pkgconfigfile.h"
-#include "tool.h"
+#include "sourcearchivecomponent.h"
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace {
-
-bool component_sort(const Component &c1, const Component &c2)
-{ return c1.get_type()<c2.get_type(); }
-
-}
-
-
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	Package(b, n),
 	source_dir(FS::dirname(f)),
@@ -34,8 +33,14 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	build_file = builder.get_vfs().get_target(f);
 	if(!build_file)
 		build_file = new File(builder, *this, f);
-	components.push_back(Component(*this, Component::TARBALL, "@src"));
-	source_tarball = &components.back();
+	source_archive = new SourceArchiveComponent(*this);
+	components.push_back(source_archive);
+}
+
+SourcePackage::~SourcePackage()
+{
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		delete *i;
 }
 
 FS::Path SourcePackage::get_temp_directory() const
@@ -63,25 +68,21 @@ FS::Path SourcePackage::get_output_directory() const
 		return source_dir/arch.get_name();
 }
 
-bool SourcePackage::match_feature(const string &cond) const
+const Component &SourcePackage::get_component(const string &n) const
 {
-	string::size_type equals = cond.find('=');
-	if(equals!=string::npos)
-	{
-		if(equals==0)
-			throw invalid_argument("SourcePackage::match_feature");
-		bool negate = cond[equals-1]=='!';
-		string feat = cond.substr(0, equals-negate);
-		string value = config.get_option("with_"+feat).value;
-		return (value==cond.substr(equals+1))!=negate;
-	}
+	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+		if((*i)->get_name()==n)
+			return **i;
+	throw key_error(n);
+}
+
+bool SourcePackage::match_feature(const string &feat, const string *comp) const
+{
+	string value = config.get_option("with_"+feat).value;
+	if(comp)
+		return value==*comp;
 	else
-	{
-		bool negate = (cond[0]=='!');
-		string feat = cond.substr(negate);
-		string value = config.get_option("with_"+feat).value;
-		return lexical_cast<bool>(value)!=negate;
-	}
+		return lexical_cast<bool>(value);
 }
 
 void SourcePackage::set_build_type(const BuildType &t)
@@ -112,37 +113,24 @@ void SourcePackage::do_prepare()
 			build_info.defines[ident] = "1";
 	}
 
-	bool export_paths = false;
-	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
 	{
-		i->prepare();
-		i->create_build_info();
-
-		if(i->get_type()==Component::LIBRARY)
-		{
-			export_binfo.libs.push_back(i->get_name());
-			export_paths = true;
-		}
-	}
+		(*i)->prepare();
+		(*i)->create_build_info();
 
-	if(export_paths)
-	{
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+		(*i)->update_exported_build_info(export_binfo);
 	}
 
 	cache.load();
 
-	bool pc_needed = false;
-	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
-	{
-		i->create_targets();
-		if(i->get_type()==Component::LIBRARY)
-			pc_needed = true;
-	}
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		(*i)->create_targets();
 
-	if(pc_needed)
+	if(!export_binfo.libs.empty())
 	{
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+
 		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
 		builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
 	}
@@ -170,25 +158,30 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
 	options = o;
-	add("description", &SourcePackage::description);
 	add("build_info",  &Loader::build_info);
+	add("datapack",    &Loader::component<DataPackComponent>);
+	add("description", &SourcePackage::description);
 	add("feature",     &Loader::feature);
 	add("generate",    &Loader::generate);
 	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("install",     &Loader::component<Component::INSTALL>);
+	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
-	add("datapack",    &Loader::component<Component::DATAPACK>);
-	add("source_tarball", &Loader::source_tarball);
+	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
+	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
+	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
+	add("source_archive", &Loader::source_archive);
+	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);
 	add("version",     &Loader::version);
 }
 
 void SourcePackage::Loader::finish()
 {
-	obj.components.sort(component_sort);
+	/* Make sure the source tarball is last in the list so targets from all
+	other components wil be created first */
+	ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_archive);
+	if(i!=obj.components.end())
+		obj.components.splice(obj.components.end(), obj.components, i);
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
@@ -207,11 +200,19 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
 	}
 }
 
-template<Component::Type t>
+template<typename C>
 void SourcePackage::Loader::component(const string &n)
 {
-	Component comp(obj, t, n);
-	load_sub(comp);
+	C *comp = new C(obj, n);
+	load_sub(*comp);
+	obj.components.push_back(comp);
+}
+
+template<typename C, typename A, A a>
+void SourcePackage::Loader::component_arg(const string &n)
+{
+	C *comp = new C(obj, n, a);
+	load_sub(*comp);
 	obj.components.push_back(comp);
 }
 
@@ -229,7 +230,8 @@ void SourcePackage::Loader::generate(const string &tag)
 
 void SourcePackage::Loader::if_feature(const string &cond)
 {
-	bool match = obj.match_feature(cond);
+	BooleanEvaluator eval(sigc::mem_fun(&obj, &SourcePackage::match_feature));
+	bool match = eval.evaluate(cond);
 	obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
 	if(match)
 		load_sub_with(*this);
@@ -242,15 +244,14 @@ void SourcePackage::Loader::interface_version(const string &v)
 		obj.version = v;
 }
 
-void SourcePackage::Loader::source_tarball()
+void SourcePackage::Loader::source_archive()
 {
-	load_sub(*obj.source_tarball);
+	load_sub(*obj.source_archive);
 }
 
-void SourcePackage::Loader::tarball(const string &n)
+void SourcePackage::Loader::tarball(const string &)
 {
-	Component trbl(obj, Component::TARBALL, n);
-	load_sub(trbl);
+	IO::print("%s: Deprecated tarball component ignored\n", get_source());
 }
 
 void SourcePackage::Loader::version(const string &v)