X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=4fddcef79de59a9ca0ca6cf05e8a5b71ec565a79;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=6bfce1fb6b8682f19c775552812b26af9da1b451;hpb=fcb86bba9e8ea7e3c93f7f1748c0291b307c46ed;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 6bfce1f..4fddcef 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,39 +1,20 @@
-#include <algorithm>
+#include <deque>
+#include <msp/core/algorithm.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
-#include "csourcefile.h"
-#include "datafile.h"
-#include "executable.h"
-#include "file.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
-#include "tool.h"
-#include "toolchain.h"
 
 using namespace std;
 using namespace Msp;
 
-Component::Component(SourcePackage &p, Type t, const string &n):
-	package(p),
-	type(t),
-	name(n),
-	install(false),
-	deflt(true)
-{ }
-
 void Component::prepare()
 {
-	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->prepare();
+	for(Package *r: requires)
+		r->prepare();
 }
 
 void Component::create_build_info()
@@ -43,216 +24,113 @@ void Component::create_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());
+	for(Package *r: direct_reqs)
+		final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY);
 
 	Package::Requirements all_reqs = direct_reqs;
-	for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	deque<Package *> queue(direct_reqs.begin(), direct_reqs.end());
+	while(!queue.empty())
 	{
-		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
-		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
-			level = BuildInfo::DEPENDENCY;
-		final_build_info.update_from((*i)->get_exported_build_info(), level);
+		Package *req = queue.front();
+		queue.pop_front();
 
-		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);
+		for(Package *r: req->get_required_packages())
+			if(!any_equals(all_reqs, r))
+			{
+				final_build_info.update_from(r->get_exported_build_info(), BuildInfo::CHAINED);
+				all_reqs.push_back(r);
+				queue.push_back(r);
+			}
 	}
 
 	final_build_info.update_from(package.get_build_info());
-
-	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();
-
 	final_build_info.update_from(build_info);
 	build_info = final_build_info;
 
-	for(UseList::const_iterator i=uses.begin(); i!=uses.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);
-	}
-
-	if(type==LIBRARY || type==MODULE)
-		if(build_info.libmode<BuildInfo::DYNAMIC)
-			build_info.libmode = BuildInfo::DYNAMIC;
-
-	if(build_info.libmode<BuildInfo::DYNAMIC)
-	{
-		for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-		{
-			const BuildInfo &ebi = (*i)->get_exported_build_info();
-			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
-		}
-	}
+	for(FS::Path &p: build_info.incpath)
+		p = (package.get_source_directory()/p).str();
+	for(FS::Path &p: build_info.libpath)
+		p = (package.get_source_directory()/p).str();
 }
 
-void Component::create_targets() const
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
 {
-	Builder &builder = package.get_builder();
-	const Toolchain &toolchain = builder.get_toolchain();
-
-	SourceList source_filenames = collect_source_files();
-	list<Target *> inst_list;
+	// XXX Cache these and check that the directories actually exist before adding them
+	BuildInfo binfo = build_info;
 
-	string inst_loc;
-	if(type==TARBALL)
+	FS::Path gen_dir = package.get_temp_directory()/"generated";
+	if(FS::descendant_depth(path, gen_dir)>=0)
 	{
-		const Tool &tar = toolchain.get_tool("TAR");
-
-		list<Target *> files;
-		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, package, *i);
-			files.push_back(file);
-		}
-
-		string tarname = name;
-		if(name=="@src")
-		{
-			tarname = package.get_name()+"-"+package.get_version();
-			files.insert(files.begin(), &package.get_build_file());
-
-			const Builder::TargetMap &targets = builder.get_targets();
-			for(Builder::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);
-		}
-
-		Target *result = tar.create_target(files, tarname);
-
-		builder.get_target("tarballs")->add_dependency(*result);
-
-		return;
+		FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+		binfo.local_incpath.push_back(package.get_source_directory()/subdir);
 	}
-	else if(type==INSTALL)
+	else
 	{
-		inst_loc = name;
-		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, package, *i);
-			inst_list.push_back(ft);
-		}
+		FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+		binfo.local_incpath.push_back(gen_dir/subdir);
 	}
-	else if(type==DATAFILE)
-	{
-		const 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, package, source_filenames.front());
-		Target *result = dcomp.create_target(*source);
+	if(!overlays.empty())
+	{
+		FS::Path dir = FS::dirname(path);
+		string last = FS::basename(dir);
+		if(any_equals(overlays, last))
+			dir = FS::dirname(dir);
 
-		builder.add_primary_target(*result);
-		if(install)
-			inst_list.push_back(result);
+		if(any_equals(sources, dir))
+		{
+			binfo.local_incpath.push_back(dir);
+			for(const string &o: overlays)
+				binfo.local_incpath.push_back(dir/o);
+		}
 	}
+	return binfo;
+}
 
-	if(type==PROGRAM || type==LIBRARY || type==MODULE)
+vector<FS::Path> Component::collect_source_files() const
+{
+	vector<FS::Path> files;
+	for(const FS::Path &p: sources)
 	{
-		list<Target *> objs;
-		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+		if(FS::is_dir(p))
 		{
-			string ext = FS::extpart(FS::basename(*i));
-			const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
-			if(tool)
+			vector<FS::Path> dirs;
+			dirs.reserve(1+overlays.size());
+			dirs.push_back(p);
+			for(const string &o: overlays)
 			{
-				Target *src = tool->create_source(*this, *i);
-				if(!src)
-					continue;
-
-				if(tool->accepts_suffix(ext))
+				FS::Path opath = p/o;
+				if(FS::is_dir(opath))
+					dirs.push_back(opath);
+			}
+			set<string> overlay_files;
+			for(auto j=dirs.begin(); j!=dirs.end(); ++j)
+			{
+				package.get_builder().get_logger().log("files", "Traversing %s", *j);
+				for(const string &f: list_files(*j))
 				{
-					Target *obj = tool->create_target(*src);
-					objs.push_back(obj);
+					if(j!=dirs.begin())
+					{
+						if(overlay_files.count(f))
+							continue;
+						overlay_files.insert(f);
+					}
+					FS::Path fn = *j/f;
+					if(!FS::is_dir(fn))
+						files.push_back(fn);
 				}
-
-				if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-					inst_list.push_back(src);
 			}
 		}
-
-		const Tool &linker = toolchain.get_tool("LINK");
-
-		list<Target *> results;
-		if(type==LIBRARY)
-		{
-			const Tool &archiver = toolchain.get_tool("AR");
-			results.push_back(linker.create_target(objs, "shared"));
-			results.push_back(archiver.create_target(objs));
-		}
-		else if(type==MODULE)
-			results.push_back(linker.create_target(objs, "shared"));
 		else
-			results.push_back(linker.create_target(objs));
-
-		const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies();
-		for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
-		{
-			/* The world target depends on all primary targets; look for the
-			static library belonging to the component.  This is a bit roundabout
-			way but gets the job done. */
-			bool found = false;
-			for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j)
-				if((*j)->get_component()==*i && dynamic_cast<StaticLibrary *>(*j))
-				{
-					results.front()->add_dependency(**j);
-					found = true;
-					break;
-				}
-			if(!found)
-				builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name));
-		}
-
-		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
-			builder.add_primary_target(**i);
-			if(install)
-				inst_list.push_back(*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_dependency(*inst);
-	}
-}
-
-Component::SourceList Component::collect_source_files() const
-{
-	SourceList files;
-	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-	{
-		FS::Path path(*i);
-		if(FS::is_dir(path))
-		{
-			package.get_builder().get_logger().log("files", format("Traversing %s", path));
-			list<string> sfiles = list_files(path);
-			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-				files.push_back(path / *j);
+			files.push_back(p);
+			for(const string &o: overlays)
+			{
+				FS::Path opath = FS::dirname(p)/o/FS::basename(p);
+				if(FS::is_reg(opath))
+					files.push_back(opath);
+			}
 		}
-		else
-			files.push_back(path);
 	}
 
 	return files;
@@ -260,47 +138,43 @@ Component::SourceList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-	DataFile::ObjectLoader<Component>(c)
+	DataFile::ObjectLoader<Component>(c),
+	ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
 {
+	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::source(const string &s)
+void Component::Loader::build_info()
 {
-	obj.sources.push_back((obj.package.get_source_directory()/s).str());
+	load_sub(obj.build_info);
 }
 
-void Component::Loader::require(const string &n)
+void Component::Loader::install_map()
 {
-	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
-	if(req)
-		obj.requires.push_back(req);
+	load_sub(obj.install_map, obj.package.get_source_directory());
 }
 
-void Component::Loader::build_info()
+void Component::Loader::overlay(const string &o)
 {
-	load_sub(obj.build_info);
+	obj.overlays.push_back(o);
 }
 
-void Component::Loader::install_map()
+void Component::Loader::require(const string &n)
 {
-	load_sub(obj.install_map, obj.package.get_source_directory());
+	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+	if(req)
+		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }
 
-void Component::Loader::use(const string &n)
+void Component::Loader::source(const string &s)
 {
-	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");
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }