X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=29bf9d10e692445bafe68c2e7095d46afa3fbadf;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=6272321b56b702b3b730c9ccca53618efab08078;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 6272321..29bf9d1 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -5,8 +5,10 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
+#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"
@@ -31,15 +33,6 @@ Component::Component(SourcePackage &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.
 */
@@ -47,13 +40,13 @@ void Component::create_build_info()
 {
 	build_info.add(pkg.get_build_info());
 
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-	{
-		if(!i->get_package())
-			continue;
-		//i->get_package()->create_build_info();
-		build_info.add(i->get_package()->get_exported_binfo());
-	}
+	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(type==PROGRAM)
 	{
@@ -94,8 +87,7 @@ void Component::create_targets() const
 	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());
@@ -128,7 +120,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);
@@ -160,9 +152,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)
@@ -196,7 +186,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()