X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fsourcepackage.cpp;h=3b0b296c2bdb1fb8f1955479f4f0929d15cc746e;hb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;hp=bb239b22b7d60cc83e1486aa1860aa4666a37258;hpb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index bb239b2..3b0b296 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -22,7 +22,7 @@ bool component_sort(const Component &c1, const Component &c2)
 
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
-	source(s),
+	source_dir(s),
 	build_type(0),
 	config(*this),
 	deps_cache(*this)
@@ -50,7 +50,7 @@ FS::Path SourcePackage::get_temp_dir() const
 	if(temp.is_absolute())
 		return temp/name/subdir;
 	else
-		return source/temp/subdir;
+		return source_dir/temp/subdir;
 }
 
 FS::Path SourcePackage::get_out_dir() const
@@ -58,87 +58,9 @@ 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/detail;
+		return source_dir/detail;
 	else
-		return source/arch.get_name()/detail;
-}
-
-string SourcePackage::expand_string(const string &str) const
-{
-	string result = str;
-	string::size_type dollar = 0;
-	unsigned n = 0;
-	while((dollar = result.find('$'))!=string::npos)
-	{
-		if(n>1000)
-			throw bad_expansion("nested too deep");
-
-		string::size_type end;
-		string var;
-		if(dollar+1<result.size() && result[dollar+1]=='{')
-		{
-			end = result.find('}', dollar+2);
-			if(end==string::npos)
-				throw bad_expansion("unterminated variable reference");
-			var = result.substr(dollar+2, end-dollar-2);
-			++end;
-		}
-		else
-		{
-			for(end=dollar+1; (isalnum(result[end]) || result[end]=='_'); ++end) ;
-			var = result.substr(dollar+1, end-dollar-1);
-		}
-
-		string value;
-		if(config.is_option(var))
-			value = config.get_option(var).value;
-		else if(var=="arch")
-			value = builder.get_current_arch().get_name();
-		else if(var=="system")
-			value = builder.get_current_arch().get_system();
-		else if(const char *ptr = getenv(var.c_str()))
-			value = ptr;
-
-		result.replace(dollar, end-dollar, value);
-
-		++n;
-	}
-
-	return result;
-}
-
-void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
-{
-	init_config();
-
-	config.load();
-
-	if(flag && config.update(opts))
-		builder.get_logger().log("configure", format("Configuration of %s changed", name));
-
-	config.finish();
-
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-	{
-		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
-		if(bpkg && bpkg->get_need_path())
-			bpkg->set_path(config.get_option(bpkg->get_name()+"_path").value);
-	}
-
-	deps_cache.load();
-
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		i->configure(opts, flag);
-}
-
-void SourcePackage::init_config()
-{
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-	{
-		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
-		if(bpkg && bpkg->get_need_path())
-			config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
-	}
+		return source_dir/arch.get_name()/detail;
 }
 
 void SourcePackage::create_build_info()
@@ -169,6 +91,7 @@ void SourcePackage::create_build_info()
 
 	for(list<Component>::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());
@@ -177,6 +100,8 @@ void SourcePackage::create_build_info()
 
 void SourcePackage::create_targets()
 {
+	deps_cache.load();
+
 	bool pc_needed = false;
 	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
 	{
@@ -188,7 +113,7 @@ void SourcePackage::create_targets()
 	if(pc_needed)
 	{
 		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-		builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
 	}
 }
 
@@ -244,7 +169,7 @@ void SourcePackage::Loader::finish()
 			{
 				if(!i->first.compare(0, k->size(), *k))
 				{
-					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source/i->first, i->second);
+					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second);
 				}
 			}
 		}
@@ -355,5 +280,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/f).str());
+			const_cast<StringList &>(i->get_sources()).push_back((obj.source_dir/f).str());
 }