X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=bebe3f7790f4c6b20d874a6208e40583f2d6f083;hb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;hp=e9d9a700d202d0fcebab400c01df24ca6e5484e5;hpb=d861af0938a9043270245f6973d4ddbdc94e75b4;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index e9d9a70..bebe3f7 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -2,29 +2,16 @@
 #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):
+Component::Component(SourcePackage &p, const string &n):
 	package(p),
-	type(t),
 	name(n),
 	install(false),
 	deflt(true)
@@ -32,193 +19,111 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 
 void Component::prepare()
 {
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 		(*i)->prepare();
 }
 
 void Component::create_build_info()
 {
-	const PackageList &pkg_reqs = package.get_required_packages();
-	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_build_info(), level);
+		final_build_info.update_from((*i)->get_exported_build_info(), level);
 
-		const PackageList &reqs = (*i)->get_required_packages();
-		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(package.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(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(type==LIBRARY || type==MODULE)
-		if(build_info.libmode<BuildInfo::DYNAMIC)
-			build_info.libmode = BuildInfo::DYNAMIC;
-
-	if(build_info.libmode<BuildInfo::DYNAMIC)
-	{
-		for(PackageList::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());
-		}
-	}
 }
 
-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();
-
-	PathList source_filenames = collect_source_files();
-	list<Target *> inst_list;
-
-	string inst_loc;
-	if(type==TARBALL)
+	// XXX Cache these and check that the directories actually exist before adding them
+	BuildInfo binfo = build_info;
+	if(!overlays.empty())
 	{
-		//const Tool &tar = toolchain.get_tool("TAR");
-
-		string tarname = name;
-		if(name=="@src")
-		{
-			tarname = package.get_name()+"-"+package.get_version();
-			source_filenames.push_back(package.get_source_directory()/"Build");
-		}
-
-		list<Target *> files;
-		for(PathList::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);
-			files.push_back(file);
-		}
-
-		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()==&package && !i->second->is_buildable())
-					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 *tarballs_tgt = builder.get_target("tarballs");
-		tarballs_tgt->add_dependency(*result);*/
-
-		return;
-	}
-	else if(type==INSTALL)
-	{
-		inst_loc = name;
-		for(PathList::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);
-		}
-	}
-	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);
-
-		builder.add_primary_target(*result);
-		if(install)
-			inst_list.push_back(result);
-	}
-
-	if(type==PROGRAM || type==LIBRARY || type==MODULE)
-	{
-		list<Target *> objs;
-		for(PathList::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, true);
-			if(tool)
+		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)
 			{
-				Target *src = tool->create_source(*this, *i);
-				if(tool->accepts_suffix(ext))
-				{
-					Target *obj = tool->create_target(*src);
-					objs.push_back(obj);
-				}
-
-				if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
-					inst_list.push_back(src);
+				dir = FS::dirname(dir);
+				break;
 			}
-		}
-
-		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));
-
-		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);
+		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;
 }
 
-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))
 		{
-			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);
+			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);
+			}
+			set<string> overlay_files;
+			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)
+				{
+					if(j!=dirs.begin())
+					{
+						if(overlay_files.count(*k))
+							continue;
+						overlay_files.insert(*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;
@@ -226,8 +131,10 @@ PathList 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);
@@ -236,9 +143,19 @@ Component::Loader::Loader(Component &c):
 	add("default",         &Component::deflt);
 }
 
-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::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)
@@ -246,14 +163,11 @@ void Component::Loader::require(const string &n)
 	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::build_info()
-{
-	load_sub(obj.build_info);
-}
-
-void Component::Loader::install_map()
+void Component::Loader::source(const string &s)
 {
-	load_sub(obj.install_map, obj.package.get_source_directory());
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }