X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=faf3bfe3c062d1948af5dd57c7086f3697ae8465;hb=28bc25948ff58612600ce29a6a0b2cf58548dff9;hp=1de15ef86781ae2696fa114eb7b3c8c0d6e344ef;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1de15ef..faf3bfe 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,10 +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 "misc.h"
+#include "file.h"
 #include "pkgconfigfile.h"
 #include "tool.h"
 #include "sourcepackage.h"
@@ -20,22 +21,23 @@ 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)
 {
-	components.push_back(Component(*this, Component::TARBALL, "@src"));
-}
+	config.load();
 
-void SourcePackage::set_build_type(const BuildType &t)
-{
-	build_type = &t;
+	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"));
+	source_tarball = &components.back();
 }
 
-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)
@@ -43,165 +45,87 @@ FS::Path SourcePackage::get_temp_dir() const
 		subdir += '.';
 		subdir += build_type->get_name();
 	}
-	return source/config.get_option("tempdir").value/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;
+	const FS::Path &temp = builder.get_temp_directory();
+	if(temp.is_absolute())
+		return temp/name/subdir;
 	else
-		return source/arch.get_name()/detail;
+		return source_dir/temp/subdir;
 }
 
-LibMode SourcePackage::get_library_mode() const
+FS::Path SourcePackage::get_output_directory() const
 {
-	const string &mode = config.get_option("staticlibs").value;
-	if(mode=="all")
-		return ALL_STATIC;
-	else if(mode=="local")
-		return LOCAL_STATIC;
-	else if(mode=="none")
-		return DYNAMIC;
+	const Architecture &arch = builder.get_current_arch();
+	if(arch.is_native())
+		return source_dir;
 	else
-		throw runtime_error("unknown library mode");
+		return source_dir/arch.get_name();
 }
 
-string SourcePackage::expand_string(const string &str) const
+bool SourcePackage::match_feature(const string &cond) const
 {
-	string result = str;
-	string::size_type dollar = 0;
-	unsigned n = 0;
-	while((dollar = result.find('$'))!=string::npos)
+	string::size_type equals = cond.find('=');
+	if(equals!=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;
+		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;
 	}
-
-	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(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-		if(i->eval())
-		{
-			const StringList &reqs = i->get_requires();
-			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-				if(Package *pkg = builder.get_package_manager().find_package(*j))
-					requires.push_back(pkg);
-		}
-
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+	else
 	{
-		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
-		if(bpkg && bpkg->get_need_path())
-			bpkg->set_path(config.get_option(bpkg->get_name()+"_path").value);
+		bool negate = (cond[0]=='!');
+		string feat = cond.substr(negate);
+		string value = config.get_option("with_"+feat).value;
+		return lexical_cast<bool>(value)!=negate;
 	}
-
-	deps_cache.load();
-
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		i->configure(opts, flag);
 }
 
-void SourcePackage::init_config()
+void SourcePackage::set_build_type(const BuildType &t)
 {
-	config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
-	config.add_option("staticlibs", "local",   "Use static libraries");
-
-	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-		config.add_option("with_"+i->name, i->def_value, i->descr);
-
-	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());
-	}
+	build_type = &t;
 }
 
-void SourcePackage::create_build_info()
+void SourcePackage::do_prepare()
 {
+	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";
 
-	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-		if(i->eval())
-			build_info.update_from(i->get_build_info());
-
+	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;
+		}
 	}
-}
 
-void SourcePackage::create_targets()
-{
+	if(export_paths)
+	{
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+	}
+
+	cache.load();
+
 	bool pc_needed = false;
 	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
 	{
@@ -213,33 +137,48 @@ 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_build_graph().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();
 }
 
 
 SourcePackage::Loader::Loader(SourcePackage &p):
-	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
 {
-	add("version",     &SourcePackage::version);
+	init(0);
+}
+
+SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+{
+	init(&o);
+}
+
+void SourcePackage::Loader::init(const Config::InputOptions *o)
+{
+	options = 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("datafile",    &Loader::component<Component::DATAFILE>);
+	add("interface_version", &Loader::interface_version);
+	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()
@@ -250,12 +189,13 @@ 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/i->first, i->second);
+					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second);
 				}
 			}
 		}
@@ -269,13 +209,22 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
 	feat.def_value = "no";
 	load_sub(feat);
 	obj.features.push_back(feat);
+	string config_key = "with_"+feat.name;
+	obj.config.add_option(config_key, feat.def_value, feat.descr);
+	if(options)
+	{
+		Config::InputOptions::const_iterator i = options->find(config_key);
+		if(i!=options->end())
+			obj.config.set_option(config_key, i->second);
+	}
 }
 
 void SourcePackage::Loader::condition(const string &c)
 {
+	IO::print("%s: Note: Old-style conditions are deprecated\n", get_source());
 	Condition cond(obj, c);
-	load_sub(cond);
-	obj.conditions.push_back(cond);
+	if(cond.eval())
+		load_sub_with(*this);
 }
 
 template<Component::Type t>
@@ -296,18 +245,37 @@ 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();
+	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 = 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);
+}
+
+void SourcePackage::Loader::interface_version(const string &v)
+{
+	obj.interface_version = v;
+	if(obj.version.empty())
+		obj.version = v;
+}
+
+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
 	{
@@ -321,5 +289,16 @@ 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<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
+}
+
+void SourcePackage::Loader::version(const string &v)
+{
+	obj.version = v;
+
+	string::size_type i = 0;
+	for(unsigned dots=0; i<obj.version.size(); ++i)
+		if(obj.version[i]=='.' && ++dots>=2)
+			break;
+	obj.interface_version = obj.version.substr(0, i);
 }