X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=07cd6ea5aee874df889e4c34c49c77ae12ae5356;hb=1968c546cfb30214e8dc5afc722bec14aa8373f5;hp=4bdff213abcaf45a404d62444c7fe19b2b343479;hpb=921fc49488a68442fb8794e1a0284a3bf1e7b91b;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 4bdff21..07cd6ea 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,10 +1,27 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/core/error.h>
+#include <msp/path/utils.h>
+#include <msp/strings/lexicalcast.h>
+#include "builder.h"
 #include "component.h"
-#include "package.h"
+#include "header.h"
+#include "install.h"
+#include "objectfile.h"
+#include "sharedlibrary.h"
+#include "sourcepackage.h"
+#include "staticlibrary.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),
@@ -14,15 +31,6 @@ Component::Component(Package &p, Type t, const string &n):
 	deflt(true)
 { }
 
-/**
-Tries to resolve all references to packages.
-*/
-void Component::resolve_refs()
-{
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		i->resolve();
-}
-
 /**
 Prepares the build information for building.
 */
@@ -30,12 +38,14 @@ void Component::create_build_info()
 {
 	build_info.add(pkg.get_build_info());
 
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+		build_info.add((*i)->get_exported_binfo());
+
+	if(type==PROGRAM)
 	{
-		if(!i->get_package())
-			continue;
-		//i->get_package()->create_build_info();
-		build_info.add(i->get_package()->get_exported_binfo());
+		string strip=pkg.get_config().get_option("strip").value;
+		if(lexical_cast<bool>(strip))
+			build_info.ldflags.push_back("-s");
 	}
 
 	if(modular)
@@ -53,6 +63,105 @@ void Component::create_build_info()
 	build_info.unique();
 }
 
+/**
+Creates all targets needed for building this component.
+*/
+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();
+
+	bool build_exe=(type!=HEADERS);
+
+	list<ObjectFile *> objs;
+	list<Target *> inst_tgts;
+	for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+	{
+		string basename=(*i)[-1];
+		string ext=Path::splitext(basename).ext;
+		if((ext==".cpp" || ext==".c") && build_exe)
+		{
+			SourceFile *src=new SourceFile(builder, this, i->str());
+
+			// Compile sources
+			ObjectFile *obj=new ObjectFile(builder, *this, *src);
+			objs.push_back(obj);
+		}
+		else if(ext==".h")
+		{
+			Target *hdr=builder.get_target(i->str());
+			if(!hdr)
+				hdr=new Header(builder, this, i->str());
+
+			// Install headers if requested
+			if(!install_headers.empty())
+				inst_tgts.push_back(hdr);
+		}
+	}
+
+	if(build_exe)
+	{
+		Executable    *exe=0;
+		StaticLibrary *slib=0;
+		if(type==LIBRARY)
+		{
+			exe=new SharedLibrary(builder, *this, objs);
+			slib=new StaticLibrary(builder, *this, objs);
+		}
+		else
+			exe=new Executable(builder, *this, objs);
+
+		if(&pkg==builder.get_main_package() && deflt)
+		{
+			def_tgt->add_depend(exe);
+			if(slib) def_tgt->add_depend(slib);
+		}
+		else
+		{
+			world->add_depend(exe);
+			if(slib) world->add_depend(slib);
+		}
+
+		if(install)
+		{
+			inst_tgts.push_back(exe);
+			if(slib)
+				inst_tgts.push_back(slib);
+		}
+	}
+
+	Target *inst_tgt=builder.get_target("install");
+	for(TargetList::const_iterator i=inst_tgts.begin(); i!=inst_tgts.end(); ++i)
+		inst_tgt->add_depend(new Install(builder, pkg, **i));
+}
+
+/**
+Collects all files belonging to the component.
+*/
+PathList Component::collect_source_files() const
+{
+	PathList files;
+	for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	{
+		struct stat st;
+		stat(*i, st);
+		if(S_ISDIR(st.st_mode))
+		{
+			list<string> sfiles=list_files(*i);
+			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
+				files.push_back(*i / *j);
+		}
+		else
+			files.push_back(*i);
+	}
+
+	return files;
+}
+
+
 Component::Loader::Loader(Component &c):
 	comp(c)
 {
@@ -73,7 +182,9 @@ void Component::Loader::source(const string &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()