X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=fff1309057916baefffe63bf4ce8192469796647;hb=98ad5711a0c56d9783a0d22b932e9b55ddd30ba2;hp=70bef6c25c8acbf58f8b201c32b0aff6b705c5d8;hpb=968db78efd29b1f4890068693728299b2c7c92c7;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 70bef6c..fff1309 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -10,38 +10,41 @@ using namespace std;
 using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
-	FileTarget(b, c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
+	FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
 	source(s)	
 {
 	component = &c;
-	add_depend(&source);
+	add_dependency(source);
 }
 
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
 	const SourcePackage &pkg = comp.get_package();
-	string fn = FS::basepart(src)+".o";
-	if(!fn.compare(0, 2, "./"))
-		fn.erase(0, 2);
-	for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
-		if(*i=='/')
-			*i = '_';
-	return pkg.get_temp_dir()/comp.get_name()/fn;
+	FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+	string fn;
+	for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
+	{
+		if(!fn.empty())
+			fn += '_';
+		if(*i!=".")
+			fn += *i;
+	}
+	return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(fn)+".o");
 }
 
-void ObjectFile::find_depends()
+void ObjectFile::find_dependencies()
 {
 	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		(*i)->prepare();
-		find_depends(dynamic_cast<FileTarget *>(*i));
+		find_dependencies(dynamic_cast<FileTarget *>(*i));
 	}
 }
 
-void ObjectFile::find_depends(FileTarget *tgt)
+void ObjectFile::find_dependencies(FileTarget *tgt)
 {
 	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
-	const Dependencies &tdeps = rtgt->get_depends();
+	const Dependencies &tdeps = rtgt->get_dependencies();
 	Dependencies deps_to_add;
 	if(rtgt==tgt)
 	{
@@ -57,7 +60,7 @@ void ObjectFile::find_depends(FileTarget *tgt)
 		for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
 		{
 			FileTarget *file = dynamic_cast<FileTarget *>(*i);
-			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source())>=0)
+			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
 			{
 				FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
 				if(Target *ddep = builder.get_vfs().get_target(displaced))
@@ -70,5 +73,5 @@ void ObjectFile::find_depends(FileTarget *tgt)
 
 	for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
 		if(find(depends.begin(), depends.end(), *i)==depends.end())
-			add_depend(*i);
+			add_dependency(**i);
 }