X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=bb9999476d0041f3529aacc44b7a3a60b3d8b960;hb=e4c839cacd8572ade951f4961e8e145d20e0103f;hp=faf3bfe3c062d1948af5dd57c7086f3697ae8465;hpb=d334fc1d04b7f83c7a2e9f16439fec884f4de471;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index faf3bfe..bb99994 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,26 +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 "androidapplicationcomponent.h"
+#include "binarycomponent.h"
 #include "binarypackage.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)),
@@ -33,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
@@ -62,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)
@@ -102,40 +104,40 @@ void SourcePackage::do_prepare()
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
-			build_info.defines["WITH_"+toupper(i->name)] = "1";
-
-	bool export_paths = false;
-	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
 	{
-		i->prepare();
-		i->create_build_info();
+		string ident = "WITH_"+toupper(i->name);
+		string value = config.get_option("with_"+i->name).value;
 
-		if(i->get_type()==Component::LIBRARY)
+		if(i->choices.empty())
 		{
-			export_binfo.libs.push_back(i->get_name());
-			export_paths = true;
+			if(!lexical_cast<bool>(value))
+				continue;
+			value = "1";
 		}
+
+		build_info.defines[ident] = value;
+		if(i->exported)
+			export_binfo.defines[ident] = value;
 	}
 
-	if(export_paths)
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
 	{
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+		(*i)->prepare();
+		(*i)->create_build_info();
+
+		(*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));
 	}
@@ -149,13 +151,15 @@ void SourcePackage::save_caches()
 
 
 SourcePackage::Loader::Loader(SourcePackage &p):
-	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
+	FeatureConditional(p, p.name)
 {
 	init(0);
 }
 
 SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
-	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
+	FeatureConditional(p, p.name)
 {
 	init(&o);
 }
@@ -163,75 +167,61 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
 	options = o;
-	add("description", &SourcePackage::description);
+	add("android_application", &Loader::component<AndroidApplicationComponent>);
 	add("build_info",  &Loader::build_info);
+	add("datapack",    &Loader::component<DataPackComponent>);
+	add("description", &SourcePackage::description);
 	add("feature",     &Loader::feature);
-	add("if",          &Loader::condition);
-	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("generate",    &Loader::generate);
+	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("tar_file",    &Loader::tar_file);
 	add("version",     &Loader::version);
 }
 
 void SourcePackage::Loader::finish()
 {
-	obj.components.sort(component_sort);
-
-	for(map<string, string>::const_iterator i=install_map.begin(); i!=install_map.end(); ++i)
-	{
-		for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j)
-		{
-			const Component::SourceList &sources = j->get_sources();
-			for(Component::SourceList::const_iterator k=sources.begin(); k!=sources.end(); ++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);
-				}
-			}
-		}
-	}
+	/* 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)
 {
 	Feature feat(n);
-	feat.descr = d;
-	feat.def_value = "no";
+	feat.description = d;
 	load_sub(feat);
 	obj.features.push_back(feat);
-	string config_key = "with_"+feat.name;
-	obj.config.add_option(config_key, feat.def_value, feat.descr);
+
+	const Config::Option &opt = obj.config.add_option(feat);
 	if(options)
 	{
-		Config::InputOptions::const_iterator i = options->find(config_key);
+		Config::InputOptions::const_iterator i = options->find(opt.name);
 		if(i!=options->end())
-			obj.config.set_option(config_key, i->second);
+			obj.config.set_option(opt.name, i->second);
 	}
 }
 
-void SourcePackage::Loader::condition(const string &c)
+template<typename C>
+void SourcePackage::Loader::component(const string &n)
 {
-	IO::print("%s: Note: Old-style conditions are deprecated\n", get_source());
-	Condition cond(obj, c);
-	if(cond.eval())
-		load_sub_with(*this);
+	C *comp = new C(obj, n);
+	load_sub(*comp);
+	obj.components.push_back(comp);
 }
 
-template<Component::Type t>
-void SourcePackage::Loader::component(const string &n)
+template<typename C, typename A, A a>
+void SourcePackage::Loader::component_arg(const string &n)
 {
-	Component comp(obj, t, n);
-	load_sub(comp);
+	C *comp = new C(obj, n, a);
+	load_sub(*comp);
 	obj.components.push_back(comp);
 }
 
@@ -240,22 +230,11 @@ void SourcePackage::Loader::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());
-	Component comp(obj, Component::LIBRARY, n);
-	load_sub(comp);
-	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)
+void SourcePackage::Loader::generate(const string &tag)
 {
-	bool match = obj.match_feature(cond);
-	obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
-	if(match)
-		load_sub_with(*this);
+	SourceGenerator *gen = new SourceGenerator(obj.builder, obj, tag);
+	load_sub(*gen);
+	obj.local_tools.add_tool(gen);
 }
 
 void SourcePackage::Loader::interface_version(const string &v)
@@ -265,31 +244,14 @@ void SourcePackage::Loader::interface_version(const string &v)
 		obj.version = v;
 }
 
-void SourcePackage::Loader::source_tarball()
-{
-	load_sub(*obj.source_tarball);
-}
-
-void SourcePackage::Loader::tarball(const string &n)
+void SourcePackage::Loader::source_archive()
 {
-	if(n=="@src")
-	{
-		IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source());
-		load_sub(*obj.source_tarball);
-	}
-	else
-	{
-		Component trbl(obj, Component::TARBALL, n);
-		load_sub(trbl);
-	}
+	load_sub(*obj.source_archive);
 }
 
-void SourcePackage::Loader::tar_file(const string &f)
+void SourcePackage::Loader::tarball(const string &)
 {
-	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<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
+	IO::print("%s: Deprecated tarball component ignored\n", get_source());
 }
 
 void SourcePackage::Loader::version(const string &v)