X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ea63655368b7eadc60b9c4fcdc0335c25f83f18f;hb=1dbeace0c44127bee08a3a8b231f4c8dcf707b2c;hp=44faa071512280cec93c9ee8e8348e51c63333a0;hpb=ef97eadef58922f45e1ba86a1d009db5ea41dd50;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 44faa07..ea63655 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,9 +1,11 @@
 #include <cstdlib>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
+#include "file.h"
 #include "misc.h"
 #include "pkgconfigfile.h"
 #include "tool.h"
@@ -20,15 +22,18 @@ bool component_sort(const Component &c1, const Component &c2)
 }
 
 
-SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	Package(b, n),
-	source(s),
+	source_dir(FS::dirname(f)),
 	build_type(0),
 	config(*this),
-	deps_cache(*this)
+	cache(*this)
 {
 	config.load();
 
+	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"));
 }
 
@@ -50,120 +55,59 @@ 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
 {
 	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;
 	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();
-
-	deps_cache.load();
-
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		i->configure(opts, flag);
-}
-
-void SourcePackage::init_config()
-{
+		return source_dir/arch.get_name();
 }
 
 void SourcePackage::create_build_info()
 {
+	BuildInfo final_build_info;
+
 	if(build_type)
-		build_info.update_from(build_type->get_build_info());
+		final_build_info.update_from(build_type->get_build_info());
 
-	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
-	const StringList &warnings = builder.get_warnings();
-	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	bool export_paths = false;
-	for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
-		export_paths = (i->get_type()==Component::LIBRARY);
-
-	if(export_paths)
-	{
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-		export_binfo.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();
+
 		if(i->get_type()==Component::LIBRARY)
+		{
 			export_binfo.libs.push_back(i->get_name());
+			export_paths = true;
+		}
+	}
+
+	if(export_paths)
+	{
+		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;
 	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
 	{
@@ -175,14 +119,14 @@ 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));
 	}
 }
 
 void SourcePackage::save_caches()
 {
 	config.save();
-	deps_cache.save();
+	cache.save();
 }
 
 
@@ -231,7 +175,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);
 				}
 			}
 		}
@@ -342,5 +286,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());
 }