X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=cb42a8e78edfa6f7fbfe873245f748896c3f9b58;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=b308c2b34301bc51c81929b25df7e86a5d6fbfa1;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index b308c2b..cb42a8e 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,21 +1,81 @@
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
 #include "builder.h"
+#include "compile.h"
 #include "component.h"
+#include "install.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, FS::relative(s.get_path(), c.get_package().get_source()).str())),
+	comp(c),
+	source(s)	
 {
-	add_depend(&src);
+	buildable = true;
+	add_depend(&source);
 }
 
-string ObjectFile::generate_target_name(const Component &comp, const string &src)
+void ObjectFile::find_depends()
 {
-	return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
+	{
+		Target *tgt = *i;
+		if(tgt->get_depends_ready())
+		{
+			i = new_deps.erase(i);
+			find_depends(tgt);
+		}
+		else
+			++i;
+	}
+
+	deps_ready = new_deps.empty();
+}
+
+
+void ObjectFile::find_depends(Target *tgt)
+{
+	SourceFile *src = dynamic_cast<SourceFile *>(tgt->get_real_target());
+	FileTarget *file = dynamic_cast<FileTarget *>(tgt);
+	if(!src || !file)
+		return;
+
+	FS::Path spath = FS::dirname(file->get_path());
+	const StringList &incpath = comp.get_build_info().incpath;
+
+	const list<string> &includes = src->get_includes();
+	for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
+	{
+		Target *hdr = builder.get_header(*i, spath, incpath);
+		if(hdr && find(depends.begin(), depends.end(), hdr)==depends.end())
+			add_depend(hdr);
+	}
+}
+
+void ObjectFile::add_depend(Target *tgt)
+{
+	Target::add_depend(tgt);
+	new_deps.push_back(tgt);
+}
+
+Action *ObjectFile::create_action()
+{
+	return new Compile(builder, *this);
+}
+
+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;
 }