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

diff --git a/source/component.cpp b/source/component.cpp
index 6d80f3b..ea53d23 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,54 +1,312 @@
+#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 "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 "symlink.h"
+#include "tarball.h"
+#include "target.h"
 
 using namespace std;
+using namespace Msp;
 
-Component::Component(Package &p, Type t, const string &n):
+Component::Component(SourcePackage &p, Type t, const string &n):
 	pkg(p),
 	type(t),
 	name(n),
-	install(false)
+	install(false),
+	deflt(true)
 { }
 
-void Component::resolve_refs()
+void Component::configure(const StringMap &opts, unsigned flag)
 {
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->resolve();
+	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);
 }
 
 void Component::create_build_info()
 {
+	const PackageList &pkg_reqs = pkg.get_requires();
+	PackageList 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)
+	{
+		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
+			build_info.add((*i)->get_exported_binfo());
+		else
+		{
+			const BuildInfo &ebi = (*i)->get_exported_binfo();
+			build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
+			build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
+			build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
+		}
+
+		const PackageList &reqs = (*i)->get_requires();
+		for(PackageList::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.add(pkg.get_build_info());
 
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+	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();
+
+	if(pkg.get_library_mode()!=DYNAMIC)
+	{
+		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		{
+			const BuildInfo &ebi = (*i)->get_exported_binfo();
+			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
+		}
+	}
+
+	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)
 	{
-		if(!i->get_package())
-			continue;
-		i->get_package()->create_build_info();
-		build_info.add(i->get_package()->get_exported_binfo());
+		build_info.cflags.push_back("-fPIC");
 	}
 
 	build_info.unique();
 }
 
+void Component::create_targets() 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);
+
+		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)
+	{
+		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);
+	}
+	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);
+			}
+		}
+	}
+
+	if(type==PROGRAM || type==LIBRARY || type==MODULE)
+	{
+		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);
+			}
+		}
+
+		list<FileTarget *> results;
+		if(type==LIBRARY)
+		{
+			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);
+		}
+	}
+
+	Target *inst_tgt = builder.get_target("install");
+	for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
+	{
+		Install *inst = new Install(builder, pkg, **i, inst_loc);
+		inst_tgt->add_depend(inst);
+
+		if(type==LIBRARY)
+			if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(*i))
+				if(!shlib->get_soname().empty())
+					inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name()));
+	}
+}
+
+PathList Component::collect_source_files() const
+{
+	PathList files;
+	for(StringList::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);
+		}
+		else
+			files.push_back(path);
+	}
+
+	return files;
+}
+
+
 Component::Loader::Loader(Component &c):
 	comp(c)
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
-	add("install_headers", &Component::install_headers);
+	add("install_headers", &Loader::install_headers);
 	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)
 {
-	comp.sources.push_back(comp.pkg.get_source()/s);
+	comp.sources.push_back(s);
 }
 
 void Component::Loader::require(const string &n)
 {
-	comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n));
+	Package *req = comp.pkg.get_builder().get_package(n);
+	if(req)
+		comp.requires.push_back(req);
+}
+
+void Component::Loader::modular()
+{
+	IO::print("%s: Note: modular is deprecated\n", get_source());
+	comp.build_info.ldflags.push_back("-rdynamic");
+	comp.build_info.libs.push_back("dl");
+}
+
+void Component::Loader::host(const string &)
+{
+	IO::print("%s: Note: host is deprecated\n", get_source());
+}
+
+void Component::Loader::install_headers(const string &p)
+{
+	IO::print("%s: Note: install_headers is deprecated\n", get_source());
+	if(comp.type==HEADERS)
+	{
+		comp.name = p;
+		comp.install = true;
+	}
+	else
+		inst_hdr = p;
 }
 
 void Component::Loader::build_info()