X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=4e7f547f36f7d05b9212a09f957907e1c79c75a8;hb=45571f0fffaf483d07d92f56ae20f00218b7463c;hp=7ef6dbed43ef0262cc1f4a0411c4ad10dbf38802;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 7ef6dbe..4e7f547 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -4,12 +4,13 @@
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
+#include "booleanevaluator.h"
 #include "builder.h"
 #include "component.h"
-#include "datafile.h"
+#include "csourcefile.h"
+#include "datapack.h"
 #include "executable.h"
 #include "file.h"
-#include "header.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -23,182 +24,234 @@ using namespace std;
 using namespace Msp;
 
 Component::Component(SourcePackage &p, Type t, const string &n):
-	pkg(p),
+	package(p),
 	type(t),
 	name(n),
 	install(false),
 	deflt(true)
 { }
 
-void Component::configure(const StringMap &opts, unsigned flag)
+void Component::prepare()
 {
-	for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i)
-		*i = (pkg.get_source()/pkg.expand_string(*i)).str();
-
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
+	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 }
 
 void Component::create_build_info()
 {
-	const PackageList &pkg_reqs = pkg.get_requires();
-	PackageList direct_reqs = requires;
+	BuildInfo final_build_info;
+
+	const Package::Requirements &pkg_reqs = package.get_required_packages();
+	Package::Requirements direct_reqs = requires;
 	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 
-	PackageList all_reqs = direct_reqs;
-	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	Package::Requirements all_reqs = direct_reqs;
+	for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 	{
 		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
 		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
 			level = BuildInfo::DEPENDENCY;
-		build_info.update_from((*i)->get_exported_binfo(), level);
+		final_build_info.update_from((*i)->get_exported_build_info(), level);
 
-		const PackageList &reqs = (*i)->get_requires();
-		for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
+		const Package::Requirements &reqs = (*i)->get_required_packages();
+		for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
 			if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
 				all_reqs.push_back(*j);
 	}
 
-	build_info.update_from(pkg.get_build_info());
+	final_build_info.update_from(package.get_build_info());
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
-	for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
-		*i = (pkg.get_source() / *i).str();
-	for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
-		*i = (pkg.get_source() / *i).str();
+	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+		*i = (package.get_source_directory() / *i).str();
+	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+		*i = (package.get_source_directory() / *i).str();
 
-	if(pkg.get_library_mode()!=DYNAMIC)
+	for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
 	{
-		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		/* Select an include path that contains all the sources for this and the
+		used component.  This should produce a sensible result in most cases. */
+		FS::Path base;
+		for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
+			base = base.empty() ? *j : FS::common_ancestor(base, *j);
+		const SourceList &use_sources = (*i)->get_sources();
+		for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
+			base = FS::common_ancestor(base, *j);
+		build_info.incpath.push_back(base);
+		build_info.libs.push_back((*i)->get_name());
+		if(!(*i)->get_install())
 		{
-			const BuildInfo &ebi = (*i)->get_exported_binfo();
-			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
+			build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+			build_info.libpath.push_back((*i)->get_package().get_source_directory());
 		}
 	}
 
-	if(type==PROGRAM)
-		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
+	if(type==LIBRARY || type==MODULE)
+		if(build_info.libmode<BuildInfo::DYNAMIC)
+			build_info.libmode = BuildInfo::DYNAMIC;
+}
 
-	build_info.unique();
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
+{
+	// XXX Cache these and check that the directories actually exist before adding them
+	BuildInfo binfo = build_info;
+	if(!overlays.empty())
+	{
+		FS::Path dir = FS::dirname(path);
+		string last = FS::basename(dir);
+		for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
+			if(last==*i)
+			{
+				dir = FS::dirname(dir);
+				break;
+			}
+
+		for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+			if(dir==*i)
+			{
+				binfo.local_incpath.push_back(dir);
+				for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+					binfo.local_incpath.push_back(*i/ *j);
+			}
+	}
+	return binfo;
 }
 
 void Component::create_targets() const
 {
-	Builder &builder = pkg.get_builder();
+	Builder &builder = package.get_builder();
+	BuildGraph &build_graph = builder.get_build_graph();
 	const Toolchain &toolchain = builder.get_toolchain();
-	Target *world = builder.get_target("world");
-	Target *def_tgt = builder.get_target("default");
 
-	PathList source_filenames = collect_source_files();
-	list<Target *> inst_list;
+	SourceList source_filenames = collect_source_files();
 
 	string inst_loc;
 	if(type==TARBALL)
 	{
-		//const Tool &tar = toolchain.get_tool("TAR");
-
-		string tarname = name;
-		if(name=="@src")
-		{
-			tarname = pkg.get_name()+"-"+pkg.get_version();
-			source_filenames.push_back(pkg.get_source()/"Build");
-		}
+		Tool &tar = toolchain.get_tool("TAR");
 
 		list<Target *> files;
-		for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			FileTarget *file = builder.get_vfs().get_target(*i);
 			if(!file)
-				file = new File(builder, *i);
+				file = new File(builder, package, *i);
 			files.push_back(file);
 		}
 
+		string tarname = name;
 		if(name=="@src")
 		{
-			const Builder::TargetMap &targets = builder.get_targets();
-			for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-				if(i->second->get_package()==&pkg && !i->second->is_buildable())
-					files.push_back(i->second);
+			tarname = package.get_name()+"-"+package.get_version();
+			files.insert(files.begin(), &package.get_build_file());
+
+			const BuildGraph::TargetMap &targets = build_graph.get_targets();
+			for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+				if(i->second->get_package()==&package && !i->second->is_buildable())
+					if(find(files.begin(), files.end(), i->second)==files.end())
+						files.push_back(i->second);
 		}
 
-		/* XXX The source files don't have a package at the moment, so we can't
-		create the tarball target until things get fixed up a bit */
-		/*Target *result = tar.create_target(files, tarname);
+		Target *result = tar.create_target(files, tarname);
 
-		Target *tarballs_tgt = builder.get_target("tarballs");
-		tarballs_tgt->add_depend(result);*/
+		build_graph.get_target("tarballs")->add_dependency(*result);
 
 		return;
 	}
 	else if(type==INSTALL)
 	{
-		inst_loc = name;
-		for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+		Target *inst = build_graph.get_target("install");
+		Tool &copy = toolchain.get_tool("CP");
+		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			FileTarget *ft;
 			if(Target *tgt = builder.get_vfs().get_target(*i))
 				ft = dynamic_cast<FileTarget *>(tgt);
 			else
-				ft = new File(builder, pkg, *i);
-			inst_list.push_back(ft);
+				ft = new File(builder, package, *i);
+			inst->add_dependency(*copy.create_target(*ft, name));
 		}
 	}
-	else if(type==DATAFILE)
+	else if(type==DATAPACK)
 	{
-		const Tool &dcomp = toolchain.get_tool("DATA");
+		Tool &dcomp = toolchain.get_tool("DATA");
 
-		File *source;
-		if(Target *tgt = builder.get_vfs().get_target(source_filenames.front()))
-			source = dynamic_cast<File *>(tgt);
-		else
-			source = new File(builder, pkg, source_filenames.front());
-		Target *result = dcomp.create_target(*source);
-
-		if(&pkg==builder.get_main_package() && deflt)
-			def_tgt->add_depend(result);
-		else
-			world->add_depend(result);
-		if(install)
-			inst_list.push_back(result);
-	}
-	else
-	{
-		for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+		list<Target *> files;
+		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			string ext = FS::extpart(FS::basename(*i));
-			if(ext==".h")
+			if(ext==".mdt")
 			{
-				FileTarget *hdr = builder.get_vfs().get_target(*i);
-				if(!hdr)
-					hdr = new Header(builder, *this, i->str());
-
-				// Install headers if requested
-				if(type==HEADERS && install)
-					inst_list.push_back(hdr);
+				Target *src = dcomp.create_source(*this, *i);
+				files.push_back(dcomp.create_target(*src, "collection"));
 			}
+			else if(Target *tgt = builder.get_vfs().get_target(*i))
+				files.push_back(tgt);
+			else
+				files.push_back(new File(builder, package, *i));
 		}
+
+		Target *result = dcomp.create_target(files, "pack");
+
+		build_graph.add_primary_target(*result);
+		if(install)
+			build_graph.add_installed_target(*result);
 	}
 
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
 	{
 		list<Target *> objs;
-		for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+		const Toolchain &pkg_tools = package.get_toolchain();
+		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			string ext = FS::extpart(FS::basename(*i));
-			const Tool *tool = toolchain.get_tool_for_suffix(ext);
+			Target *src = 0;
+
+			Tool *gen = pkg_tools.get_tool_for_suffix(ext);
+			if(gen)
+			{
+				Target *tmpl = gen->create_source(*this, *i);
+				if(tmpl)
+				{
+					src = gen->create_target(*tmpl);
+					ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
+				}
+			}
+
+			Tool *tool = toolchain.get_tool_for_suffix(ext, true);
 			if(tool)
 			{
-				Target *src = tool->create_source(*this, *i);
-				Target *obj = tool->create_target(*src);
-				objs.push_back(obj);
+				if(!src)
+					src = tool->create_source(*this, *i);
+				if(!src)
+					continue;
+
+				if(tool->accepts_suffix(ext))
+				{
+					Target *obj = tool->create_target(*src);
+					objs.push_back(obj);
+				}
+
+				if(type==LIBRARY && install)
+				{
+					if(dynamic_cast<FileTarget *>(src)->is_installable())
+						build_graph.add_installed_target(*src);
+
+					const Target::Dependencies &side_effects = src->get_side_effects();
+					for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j)
+						if(dynamic_cast<FileTarget *>(*j)->is_installable())
+							build_graph.add_installed_target(**j);
+				}
 			}
 		}
 
-		const Tool &linker = toolchain.get_tool("LINK");
+		Tool &linker = toolchain.get_tool("LINK");
 
 		list<Target *> results;
 		if(type==LIBRARY)
 		{
-			const Tool &archiver = toolchain.get_tool("AR");
+			Tool &archiver = toolchain.get_tool("AR");
 			results.push_back(linker.create_target(objs, "shared"));
 			results.push_back(archiver.create_target(objs));
 		}
@@ -209,38 +262,47 @@ void Component::create_targets() const
 
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
-			if(&pkg==builder.get_main_package() && deflt)
-				def_tgt->add_depend(*i);
-			else
-				world->add_depend(*i);
+			build_graph.add_primary_target(**i);
 			if(install)
-				inst_list.push_back(*i);
+				build_graph.add_installed_target(**i);
 		}
 	}
-
-	Target *inst_tgt = builder.get_target("install");
-	const Tool &copy = toolchain.get_tool("CP");
-	for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-	{
-		Target *inst = copy.create_target(**i, inst_loc);
-		inst_tgt->add_depend(inst);
-	}
 }
 
-PathList Component::collect_source_files() const
+Component::SourceList Component::collect_source_files() const
 {
-	PathList files;
-	for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	SourceList files;
+	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
 	{
 		FS::Path path(*i);
 		if(FS::is_dir(path))
 		{
-			list<string> sfiles = list_files(path);
-			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-				files.push_back(path / *j);
+			SourceList dirs;
+			dirs.push_back(path);
+			for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+			{
+				FS::Path opath = path / *j;
+				if(FS::is_dir(opath))
+					dirs.push_back(opath);
+			}
+			for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+			{
+				package.get_builder().get_logger().log("files", format("Traversing %s", *j));
+				list<string> sfiles = list_files(*j);
+				for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+					files.push_back(*j / *k);
+			}
 		}
 		else
+		{
 			files.push_back(path);
+			for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+			{
+				FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+				if(FS::is_reg(opath))
+					files.push_back(opath);
+			}
+		}
 	}
 
 	return files;
@@ -248,39 +310,77 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-	comp(c)
+	DataFile::ObjectLoader<Component>(c)
 {
+	add("if_arch",         &Loader::if_arch);
+	add("if_feature",      &Loader::if_feature);
+	add("overlay",         &Loader::overlay);
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
+	add("install_map",     &Loader::install_map);
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
 	add("default",         &Component::deflt);
+	add("use",             &Loader::use);
 }
 
-void Component::Loader::finish()
+void Component::Loader::build_info()
 {
-	if(!inst_hdr.empty())
-	{
-		Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
-		hdrcomp.sources = comp.sources;
-		hdrcomp.install = true;
-		const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
-	}
+	load_sub(obj.build_info);
 }
 
-void Component::Loader::source(const string &s)
+void Component::Loader::if_arch(const string &cond)
 {
-	comp.sources.push_back(s);
+	BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false);
+	bool match = eval.evaluate(cond);
+	obj.package.get_builder().get_logger().log("configure",
+		format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
+void Component::Loader::if_feature(const string &cond)
+{
+	BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature));
+	bool match = eval.evaluate(cond);
+	obj.package.get_builder().get_logger().log("configure",
+		format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
+void Component::Loader::install_map()
+{
+	load_sub(obj.install_map, obj.package.get_source_directory());
+}
+
+void Component::Loader::overlay(const string &o)
+{
+	obj.overlays.push_back(o);
 }
 
 void Component::Loader::require(const string &n)
 {
-	Package *req = comp.pkg.get_builder().get_package(n);
+	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
 	if(req)
-		comp.requires.push_back(req);
+		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }
 
-void Component::Loader::build_info()
+void Component::Loader::source(const string &s)
+{
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
+}
+
+void Component::Loader::use(const string &n)
 {
-	load_sub(comp.build_info);
+	const SourcePackage::ComponentList &components = obj.package.get_components();
+	for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+		if(i->get_name()==n && i->get_type()==LIBRARY)
+		{
+			obj.uses.push_back(&*i);
+			return;
+		}
+	throw invalid_argument("Component::Loader::use");
 }