X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=4451a69f662f4074260520f4173eb98ec318dac8;hb=463a3521e27870294455373f9c69279069611975;hp=e48e4f518477ff285d8b2878e8739d0f6b5147ca;hpb=098507f58825446484c7ae0ef96eadafa32499c8;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index e48e4f5..4451a69 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,12 +1,4 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
-#include <msp/core/except.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -121,8 +113,8 @@ void Component::create_targets() const
 
 		if(name=="@src")
 		{
-			const TargetMap &targets = builder.get_targets();
-			for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+			const Builder::TargetMap &targets = builder.get_targets();
+			for(Builder::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");
@@ -131,7 +123,7 @@ void Component::create_targets() const
 		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
 		{
 			FileTarget *ft;
-			if(Target *tgt = builder.get_target(i->str()))
+			if(Target *tgt = builder.get_target_by_path(*i))
 				ft = dynamic_cast<FileTarget *>(tgt);
 			else
 				ft = new File(builder, *i);
@@ -149,7 +141,7 @@ void Component::create_targets() const
 		for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
 		{
 			FileTarget *ft;
-			if(Target *tgt = builder.get_target(i->str()))
+			if(Target *tgt = builder.get_target_by_path(*i))
 				ft = dynamic_cast<FileTarget *>(tgt);
 			else
 				ft = new File(builder, pkg, *i);
@@ -159,7 +151,7 @@ void Component::create_targets() const
 	else if(type==DATAFILE)
 	{
 		File *source;
-		if(Target *tgt = builder.get_target(files.front().str()))
+		if(Target *tgt = builder.get_target_by_path(files.front()))
 			source = dynamic_cast<File *>(tgt);
 		else
 			source = new File(builder, pkg, files.front());
@@ -179,7 +171,7 @@ void Component::create_targets() const
 			string ext = FS::extpart(FS::basename(*i));
 			if(ext==".h")
 			{
-				FileTarget *hdr = dynamic_cast<FileTarget *>(builder.get_target(i->str()));
+				FileTarget *hdr = builder.get_target_by_path(*i);
 				if(!hdr)
 					hdr = new Header(builder, *this, i->str());