X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=fff1309057916baefffe63bf4ce8192469796647;hb=82ae60a647ebb9567f7177c353245f4d72faaf5e;hp=d29cd11df850759833705e0103264c50d09de512;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index d29cd11..fff1309 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,28 +1,77 @@
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
 #include "builder.h"
-#include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
-	Target(b, &c.get_package(), generate_target_name(c, src.get_name())),
-	comp(c)
+ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
+	FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
+	source(s)	
 {
-	buildable=true;
-	add_depend(&src);
+	component = &c;
+	add_dependency(source);
 }
 
-Action *ObjectFile::build()
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
-	return Target::build(new Compile(builder, depends.front()->get_name(), name, comp));
+	const SourcePackage &pkg = comp.get_package();
+	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");
 }
 
-string ObjectFile::generate_target_name(const Component &comp, const string &src)
+void ObjectFile::find_dependencies()
 {
-	return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+	{
+		(*i)->prepare();
+		find_dependencies(dynamic_cast<FileTarget *>(*i));
+	}
+}
+
+void ObjectFile::find_dependencies(FileTarget *tgt)
+{
+	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
+	const Dependencies &tdeps = rtgt->get_dependencies();
+	Dependencies deps_to_add;
+	if(rtgt==tgt)
+	{
+		/* We are using the target from its original location, so dependencies
+		apply directly */
+		deps_to_add = tdeps;
+	}
+	else
+	{
+		/* The target has been displaced by installing it.  Displace any
+		dependencies that come from the same package as well. */
+		const SourcePackage *tpkg = rtgt->get_package();
+		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_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))
+					deps_to_add.push_back(ddep);
+			}
+			else
+				deps_to_add.push_back(*i);
+		}
+	}
+
+	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_dependency(**i);
 }