X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fcomponent.cpp;h=26a0ab4b7246d5c24eccd6f26c494fa0fea54335;hb=refs%2Ftags%2F0.9;hp=b2ac62cc1b2a857a72c64bad3977e671a7f17c0d;hpb=b5ad62c2c4c7eeadd881e3f157bde96e4dd2cc0e;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index b2ac62c..26a0ab4 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,19 +1,29 @@
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/core/except.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
 #include "header.h"
 #include "install.h"
 #include "objectfile.h"
-#include "package.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),
@@ -23,15 +33,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.
 */
@@ -39,12 +40,30 @@ 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());
+
+	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)
+	{
+		// 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());
+		}
+	}
+
+	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)
@@ -73,14 +92,13 @@ void Component::create_targets() const
 
 	PathList files=collect_source_files();
 
-	bool build_exe=(type!=Component::HEADERS);
+	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;
+		string ext=FS::extpart(FS::basename(*i));
 		if((ext==".cpp" || ext==".c") && build_exe)
 		{
 			SourceFile *src=new SourceFile(builder, this, i->str());
@@ -105,7 +123,7 @@ void Component::create_targets() const
 	{
 		Executable    *exe=0;
 		StaticLibrary *slib=0;
-		if(type==Component::LIBRARY)
+		if(type==LIBRARY)
 		{
 			exe=new SharedLibrary(builder, *this, objs);
 			slib=new StaticLibrary(builder, *this, objs);
@@ -113,7 +131,7 @@ void Component::create_targets() const
 		else
 			exe=new Executable(builder, *this, objs);
 
-		if(&pkg==builder.get_default_package() && deflt)
+		if(&pkg==builder.get_main_package() && deflt)
 		{
 			def_tgt->add_depend(exe);
 			if(slib) def_tgt->add_depend(slib);
@@ -145,9 +163,7 @@ 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))
+		if(FS::is_dir(*i))
 		{
 			list<string> sfiles=list_files(*i);
 			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
@@ -181,7 +197,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()