X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fsourcepackage.cpp;h=94bb4ba9c0321b7a726e43e21c4552e8baaff3a4;hb=402a19ee62dc2d3465b48fc518bdae265fc3e090;hp=22330b2970dd4184db97d783a6646be4bc30da4f;hpb=7bf0b5d013b88b0408031e2d6594357e71c8138f;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 22330b2..94bb4ba 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -35,6 +35,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)
@@ -61,11 +62,10 @@ FS::Path SourcePackage::get_temp_dir() const
 FS::Path SourcePackage::get_out_dir() const
 {
 	const Architecture &arch = builder.get_current_arch();
-	string detail = (build_type ? build_type->get_name() : string());
 	if(arch.is_native())
-		return source_dir/detail;
+		return source_dir;
 	else
-		return source_dir/arch.get_name()/detail;
+		return source_dir/arch.get_name();
 }
 
 void SourcePackage::create_build_info()
@@ -151,7 +151,6 @@ 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("program",     &Loader::component<Component::PROGRAM>);
 	add("library",     &Loader::component<Component::LIBRARY>);
@@ -159,6 +158,7 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	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);
 }
@@ -231,16 +231,6 @@ void SourcePackage::Loader::headers(const string &n)
 		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);
-}
-
 void SourcePackage::Loader::if_feature(const string &cond)
 {
 	bool match = false;
@@ -267,13 +257,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
 	{