X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=5c83fd7ec18607b4e6728a6594bbb040f017d1ee;hb=0dea0d850f6690de07933794592916d11c9d3f49;hp=ea63655368b7eadc60b9c4fcdc0335c25f83f18f;hpb=0cf7bb122ef4c0fc46fbb2aaaf1a9d6d5ccec0f1;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ea63655..5c83fd7 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"
@@ -35,6 +34,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	if(!build_file)
 		build_file = new File(builder, *this, f);
 	components.push_back(Component(*this, Component::TARBALL, "@src"));
+	source_tarball = &components.back();
 }
 
 void SourcePackage::set_build_type(const BuildType &t)
@@ -67,7 +67,7 @@ FS::Path SourcePackage::get_out_dir() const
 		return source_dir/arch.get_name();
 }
 
-void SourcePackage::create_build_info()
+void SourcePackage::do_prepare()
 {
 	BuildInfo final_build_info;
 
@@ -102,10 +102,7 @@ void SourcePackage::create_build_info()
 		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
 		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 	}
-}
 
-void SourcePackage::create_targets()
-{
 	cache.load();
 
 	bool pc_needed = false;
@@ -131,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);
 }
@@ -150,14 +147,14 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	add("build_info",  &Loader::build_info);
 	add("feature",     &Loader::feature);
 	add("if",          &Loader::condition);
-	add("if_arch",     &Loader::if_arch);
-	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("datafile",    &Loader::component<Component::DATAFILE>);
+	add("source_tarball", &Loader::source_tarball);
 	add("tarball",     &Loader::tarball);
 	add("tar_file",    &Loader::tar_file);
 }
@@ -170,10 +167,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);
 				}
@@ -225,19 +223,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();
-}
-
-void SourcePackage::Loader::if_arch(const string &cond)
-{
-	const Architecture &arch = obj.builder.get_current_arch();
-	bool negate = (cond[0]=='!');
-	bool match = (arch.match_name(cond.substr(negate))!=negate);
-	obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
-	if(match)
-		load_sub_with(*this);
+	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)
@@ -247,7 +235,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;
@@ -266,13 +254,17 @@ void SourcePackage::Loader::if_feature(const string &cond)
 		load_sub_with(*this);
 }
 
+void SourcePackage::Loader::source_tarball()
+{
+	load_sub(*obj.source_tarball);
+}
+
 void SourcePackage::Loader::tarball(const string &n)
 {
 	if(n=="@src")
 	{
-		for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
-			if(i->get_type()==Component::TARBALL && i->get_name()==n)
-				load_sub(*i);
+		IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source());
+		load_sub(*obj.source_tarball);
 	}
 	else
 	{
@@ -286,5 +278,5 @@ 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());
 }