X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=68c9b1800097ad6ef014ae5b5a86122e52d392cf;hb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;hp=6d80f3b0efc249511eae49e0d41cd0ec1d317172;hpb=e71eaecb9a31304fe5e096ea29660ea25c1bfa9f;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 6d80f3b..68c9b18 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,57 +1,286 @@
+#include <algorithm>
+#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 "builder.h"
 #include "component.h"
-#include "package.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(Package &p, Type t, const string &n):
-	pkg(p),
+Component::Component(SourcePackage &p, Type t, const string &n):
+	package(p),
 	type(t),
 	name(n),
-	install(false)
+	install(false),
+	deflt(true)
 { }
 
-void Component::resolve_refs()
+void Component::prepare()
 {
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->resolve();
+	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 }
 
 void Component::create_build_info()
 {
-	build_info.add(pkg.get_build_info());
+	BuildInfo final_build_info;
 
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+	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());
+
+	Package::Requirements all_reqs = direct_reqs;
+	for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 	{
-		if(!i->get_package())
-			continue;
-		i->get_package()->create_build_info();
-		build_info.add(i->get_package()->get_exported_binfo());
+		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);
+
+		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.unique();
+	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);
+		build_info.libs.push_back((*i)->get_name());
+		if(!(*i)->get_install())
+		{
+		    build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+			build_info.libpath.push_back((*i)->get_package().get_source_directory());
+		}
+	}
+
+	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());
+		}
+	}
 }
 
+void Component::create_targets() const
+{
+	Builder &builder = package.get_builder();
+	const Toolchain &toolchain = builder.get_toolchain();
+
+	SourceList source_filenames = collect_source_files();
+
+	string inst_loc;
+	if(type==TARBALL)
+	{
+		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;
+	}
+	else if(type==INSTALL)
+	{
+		Target *inst = builder.get_target("install");
+		const 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, package, *i);
+			inst->add_dependency(*copy.create_target(*ft, name));
+		}
+	}
+	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)
+			builder.add_installed_target(*result);
+	}
+
+	if(type==PROGRAM || type==LIBRARY || type==MODULE)
+	{
+		list<Target *> objs;
+		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, true);
+			if(tool)
+			{
+				Target *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 && dynamic_cast<FileTarget *>(src)->is_installable())
+					builder.add_installed_target(*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));
+
+		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
+		{
+			builder.add_primary_target(**i);
+			if(install)
+				builder.add_installed_target(**i);
+		}
+	}
+}
+
+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);
+		}
+		else
+			files.push_back(path);
+	}
+
+	return files;
+}
+
+
 Component::Loader::Loader(Component &c):
-	comp(c)
+	DataFile::ObjectLoader<Component>(c)
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
-	add("install_headers", &Component::install_headers);
+	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)
 {
-	comp.sources.push_back(comp.pkg.get_source()/s);
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }
 
 void Component::Loader::require(const string &n)
 {
-	comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n));
+	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+	if(req)
+		obj.requires.push_back(req);
 }
 
 void Component::Loader::build_info()
 {
-	load_sub(comp.build_info);
+	load_sub(obj.build_info);
+}
+
+void Component::Loader::install_map()
+{
+	load_sub(obj.install_map, obj.package.get_source_directory());
+}
+
+void Component::Loader::use(const string &n)
+{
+	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");
 }