X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=e3f80fbc95b9becfd93c89ec9968784783d90dbf;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=5e32de5275f12a2dc1eb1f66c3466d15b482e050;hpb=ce86d90028b2e69799a82fda19f78161e1c09099;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 5e32de5..e3f80fb 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,232 +1,143 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#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 "datafile.h"
-#include "executable.h"
-#include "file.h"
-#include "header.h"
-#include "install.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
 
 using namespace std;
 using namespace Msp;
 
-Component::Component(SourcePackage &p, Type t, const string &n):
-	pkg(p),
-	type(t),
+Component::Component(SourcePackage &p, const string &n):
+	package(p),
 	name(n),
 	install(false),
-	module_host(0),
-	modular(false),
 	deflt(true)
 { }
 
-void Component::create_build_info()
+void Component::prepare()
 {
-	build_info.add(pkg.get_build_info());
+	for(Package *r: requires)
+		r->prepare();
+}
 
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		build_info.add((*i)->get_exported_binfo());
+void Component::create_build_info()
+{
+	BuildInfo 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();
+	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);
 
-	if(pkg.get_library_mode()!=DYNAMIC)
+	Package::Requirements all_reqs = direct_reqs;
+	deque<Package *> queue(direct_reqs.begin(), direct_reqs.end());
+	while(!queue.empty())
 	{
-		// XXX This may pull in some unnecessary libpaths too.  More thought required.
-		PackageList reqs=pkg.collect_requires();
-		for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i)
-		{
-			const BuildInfo &ebi=(*i)->get_exported_binfo();
-			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
-		}
-	}
+		Package *req = queue.front();
+		queue.pop_front();
 
-	if(type==PROGRAM)
-	{
-		string strip=pkg.get_config().get_option("strip").value;
-		if(lexical_cast<bool>(strip))
-			build_info.ldflags.push_back("-s");
-	}
-	else if(type==LIBRARY)
-	{
-		build_info.cflags.push_back("-fPIC");
+		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);
+			}
 	}
 
-	if(modular)
-	{
-		build_info.ldflags.push_back("-rdynamic");
-		build_info.libs.push_back("dl");
-	}
-	else if(module_host)
-	{
-		const PathList &host_src=module_host->get_sources();
-		for(PathList::const_iterator i=host_src.begin(); i!=host_src.end(); ++i)
-			build_info.incpath.push_back(i->str());
-	}
+	final_build_info.update_from(package.get_build_info());
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
-	build_info.unique();
+	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=pkg.get_builder();
-	Target *world=builder.get_target("world");
-	Target *def_tgt=builder.get_target("default");
-
-	PathList files=collect_source_files();
-	list<FileTarget *> inst_list;
-
-	string inst_loc;
-	if(type==TARBALL)
-	{
-		string tarname=name;
-		if(name=="@src")
-			tarname=pkg.get_name()+"-"+pkg.get_version();
-		TarBall *result=new TarBall(builder, pkg, tarname);
-
-		if(name=="@src")
-		{
-			const TargetMap &targets=builder.get_targets();
-			for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-				if(i->second->get_package()==&pkg && !i->second->is_buildable())
-					result->add_depend(i->second);
-			files.push_back(pkg.get_source()/"Build");
-		}
-
-		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-		{
-			FileTarget *ft;
-			if(Target *tgt=builder.get_target(i->str()))
-				ft=dynamic_cast<FileTarget *>(tgt);
-			else
-				ft=new File(builder, *i);
-			result->add_depend(ft);
-		}
-
-		Target *tarbls_tgt=builder.get_target("tarballs");
-		tarbls_tgt->add_depend(result);
+	// XXX Cache these and check that the directories actually exist before adding them
+	BuildInfo binfo = build_info;
 
-		return;
-	}
-	else if(type==INSTALL)
-	{
-		inst_loc=name;
-		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-		{
-			FileTarget *ft;
-			if(Target *tgt=builder.get_target(i->str()))
-				ft=dynamic_cast<FileTarget *>(tgt);
-			else
-				ft=new File(builder, pkg, *i);
-			inst_list.push_back(ft);
-		}
-	}
-	else if(type==DATAFILE)
+	FS::Path gen_dir = package.get_temp_directory()/"generated";
+	if(FS::descendant_depth(path, gen_dir)>=0)
 	{
-		File *source;
-		if(Target *tgt=builder.get_target(files.front().str()))
-			source=dynamic_cast<File *>(tgt);
-		else
-			source=new File(builder, pkg, files.front());
-		::DataFile *result=new ::DataFile(builder, *this, *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);
+		FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+		binfo.local_incpath.push_back(package.get_source_directory()/subdir);
 	}
 	else
 	{
-		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-		{
-			string ext=FS::extpart(FS::basename(*i));
-			if(ext==".h")
-			{
-				FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
-				if(!hdr)
-					hdr=new Header(builder, *this, i->str());
-
-				// Install headers if requested
-				if(type==HEADERS && install)
-					inst_list.push_back(hdr);
-			}
-		}
+		FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+		binfo.local_incpath.push_back(gen_dir/subdir);
 	}
 
-	if(type==PROGRAM || type==LIBRARY || type==MODULE)
+	if(!overlays.empty())
 	{
-		list<ObjectFile *> objs;
-		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-		{
-			string ext=FS::extpart(FS::basename(*i));
-			if((ext==".cpp" || ext==".cc" || ext==".c"))
-			{
-				SourceFile *src=new SourceFile(builder, *this, i->str());
-				ObjectFile *obj=new ObjectFile(builder, *this, *src);
-				objs.push_back(obj);
-			}
-		}
+		FS::Path dir = FS::dirname(path);
+		string last = FS::basename(dir);
+		if(any_equals(overlays, last))
+			dir = FS::dirname(dir);
 
-		list<FileTarget *> results;
-		if(type==LIBRARY)
+		if(any_equals(sources, dir))
 		{
-			results.push_back(new SharedLibrary(builder, *this, objs));
-			results.push_back(new StaticLibrary(builder, *this, objs));
-		}
-		else
-			results.push_back(new Executable(builder, *this, objs));
-
-		for(list<FileTarget *>::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);
-			if(install)
-				inst_list.push_back(*i);
+			binfo.local_incpath.push_back(dir);
+			for(const string &o: overlays)
+				binfo.local_incpath.push_back(dir/o);
 		}
 	}
-
-	Target *inst_tgt=builder.get_target("install");
-	for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-		inst_tgt->add_depend(new Install(builder, pkg, **i, inst_loc));
+	return binfo;
 }
 
-PathList Component::collect_source_files() const
+vector<FS::Path> Component::collect_source_files() const
 {
-	PathList files;
-	for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	vector<FS::Path> files;
+	for(const FS::Path &p: sources)
 	{
-		if(FS::is_dir(*i))
+		if(FS::is_dir(p))
 		{
-			list<string> sfiles=list_files(*i);
-			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-				files.push_back(*i / *j);
+			vector<FS::Path> dirs;
+			dirs.reserve(1+overlays.size());
+			dirs.push_back(p);
+			for(const string &o: overlays)
+			{
+				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))
+				{
+					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);
+				}
+			}
 		}
 		else
-			files.push_back(*i);
+		{
+			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);
+			}
+		}
 	}
 
 	return files;
@@ -234,76 +145,43 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-	comp(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_headers", &Loader::install_headers);
+	add("install_map",     &Loader::install_map);
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
-	add("modular",         &Loader::modular);
-	add("host",            &Loader::host);
 	add("default",         &Component::deflt);
 }
 
-void Component::Loader::finish()
-{
-	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);
-	}
-}
-
-void Component::Loader::source(const string &s)
+void Component::Loader::build_info()
 {
-	comp.sources.push_back(comp.pkg.get_source()/s);
+	load_sub(obj.build_info);
 }
 
-void Component::Loader::require(const string &n)
+void Component::Loader::install_map()
 {
-	Package *req=comp.pkg.get_builder().get_package(n);
-	if(req)
-		comp.requires.push_back(req);
+	load_sub(obj.install_map, obj.package.get_source_directory());
 }
 
-void Component::Loader::modular()
+void Component::Loader::overlay(const string &o)
 {
-	if(comp.type!=PROGRAM)
-		throw Exception("Only programs can be modular");
-	comp.modular=true;
+	obj.overlays.push_back(o);
 }
 
-void Component::Loader::host(const string &n)
-{
-	const ComponentList &comps=comp.pkg.get_components();
-	for(ComponentList::const_iterator i=comps.begin(); i!=comps.end(); ++i)
-		if(i->get_name()==n)
-		{
-			if(i->get_type()!=PROGRAM || !i->is_modular())
-				throw Exception("Module host must be a modular program");
-			comp.module_host=&*i;
-			return;
-		}
-
-	throw KeyError("Unknown component", n);
-}
-
-void Component::Loader::install_headers(const string &p)
+void Component::Loader::require(const string &n)
 {
-	IO::print("%s: Note: install_headers is deprecated\n", get_source());
-	if(comp.type==HEADERS)
-	{
-		comp.name=p;
-		comp.install=true;
-	}
+	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+	if(req)
+		obj.requires.push_back(req);
 	else
-		inst_hdr=p;
+		obj.problems.push_back(format("Required package %s not found", n));
 }
 
-void Component::Loader::build_info()
+void Component::Loader::source(const string &s)
 {
-	load_sub(comp.build_info);
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }