X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=7aafe90d68c1412594a086b998cb828d78605269;hb=5c16082773d2589c69fe4d7920e56fa66a96fc2b;hp=8068bc6ed02f62277984215dd74c5b07d52b5d62;hpb=ce3fc52c7e79c0bf182dad12ed6ba3a0203c59ce;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 8068bc6..7aafe90 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -2,7 +2,6 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
@@ -11,35 +10,37 @@ 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())),
-	comp(c),
+	FileTarget(b, c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
 	source(s)	
 {
-	buildable = true;
-	add_depend(&source);
+	component = &c;
+	add_depend(source);
+}
+
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &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;
 }
 
 void ObjectFile::find_depends()
 {
-	for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
-		Target *tgt = *i;
-		if(tgt->get_depends_ready())
-		{
-			i = new_deps.erase(i);
-			find_depends(dynamic_cast<FileTarget *>(tgt));
-		}
-		else
-			++i;
+		(*i)->prepare();
+		find_depends(dynamic_cast<FileTarget *>(*i));
 	}
-
-	deps_ready = new_deps.empty();
 }
 
-
 void ObjectFile::find_depends(FileTarget *tgt)
 {
-	Target *rtgt = tgt->get_real_target();
+	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
 	const Dependencies &tdeps = rtgt->get_depends();
 	Dependencies deps_to_add;
 	if(rtgt==tgt)
@@ -52,7 +53,7 @@ void ObjectFile::find_depends(FileTarget *tgt)
 	{
 		/* The target has been displaced by installing it.  Displace any
 		dependencies that come from the same package as well. */
-		const SourcePackage *tpkg = dynamic_cast<const SourcePackage *>(rtgt->get_package());
+		const SourcePackage *tpkg = rtgt->get_package();
 		for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
 		{
 			FileTarget *file = dynamic_cast<FileTarget *>(*i);
@@ -69,23 +70,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);
-}
-
-void ObjectFile::add_depend(Target *tgt)
-{
-	Target::add_depend(tgt);
-	new_deps.push_back(tgt);
-}
-
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &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;
+			add_depend(**i);
 }