X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=e3f11097bfd7693f8333c7c82eca5c227fc45832;hb=8a2579d4b8e510405402ec316d53a509152aa6ea;hp=8ad12d37c7f78ccc533e4366df613709c637902e;hpb=373e9bb43c24d38316c5bb0393f4a369563319d3;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 8ad12d3..e3f1109 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -37,12 +37,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	source_tarball = &components.back();
 }
 
-void SourcePackage::set_build_type(const BuildType &t)
-{
-	build_type = &t;
-}
-
-FS::Path SourcePackage::get_temp_dir() const
+FS::Path SourcePackage::get_temp_directory() const
 {
 	string subdir = builder.get_current_arch().get_name();
 	if(build_type)
@@ -58,7 +53,7 @@ FS::Path SourcePackage::get_temp_dir() const
 		return source_dir/temp/subdir;
 }
 
-FS::Path SourcePackage::get_out_dir() const
+FS::Path SourcePackage::get_output_directory() const
 {
 	const Architecture &arch = builder.get_current_arch();
 	if(arch.is_native())
@@ -67,6 +62,32 @@ FS::Path SourcePackage::get_out_dir() const
 		return source_dir/arch.get_name();
 }
 
+bool SourcePackage::match_feature(const string &cond) 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;
+	}
+	else
+	{
+		bool negate = (cond[0]=='!');
+		string feat = cond.substr(negate);
+		string value = config.get_option("with_"+feat).value;
+		return lexical_cast<bool>(value)!=negate;
+	}
+}
+
+void SourcePackage::set_build_type(const BuildType &t)
+{
+	build_type = &t;
+}
+
 void SourcePackage::do_prepare()
 {
 	BuildInfo final_build_info;
@@ -145,40 +166,21 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	add("description", &SourcePackage::description);
 	add("build_info",  &Loader::build_info);
 	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("interface_version", &Loader::interface_version);
-	add("datafile",    &Loader::component<Component::DATAFILE>);
+	add("datapack",    &Loader::component<Component::DATAPACK>);
 	add("source_tarball", &Loader::source_tarball);
 	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);
-				}
-			}
-		}
-	}
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
@@ -198,14 +200,6 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
 	}
 }
 
-void SourcePackage::Loader::condition(const string &c)
-{
-	IO::print("%s: Note: Old-style conditions are deprecated\n", get_source());
-	Condition cond(obj, c);
-	if(cond.eval())
-		load_sub_with(*this);
-}
-
 template<Component::Type t>
 void SourcePackage::Loader::component(const string &n)
 {
@@ -219,37 +213,9 @@ 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)
 {
-	bool match = false;
-	string::size_type equals = cond.find('=');
-	if(equals!=string::npos)
-	{
-		if(equals==0)
-			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;
-		match = (value==cond.substr(equals+1))!=negate;
-		value = cond.substr(equals+1);
-	}
-	else
-	{
-		bool negate = (cond[0]=='!');
-		string name = cond.substr(negate);
-		string value = obj.config.get_option("with_"+name).value;
-		match = lexical_cast<bool>(value)!=negate;
-	}
+	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);
@@ -269,24 +235,8 @@ void SourcePackage::Loader::source_tarball()
 
 void SourcePackage::Loader::tarball(const string &n)
 {
-	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);
-	}
-}
-
-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<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
+	Component trbl(obj, Component::TARBALL, n);
+	load_sub(trbl);
 }
 
 void SourcePackage::Loader::version(const string &v)