X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=1dcfd2e6b3c7b588088a03d703aa9d3a24224154;hb=bc85cc286c8a3f1055f1979a7ff8697cf1b61912;hp=af1c04a5cf4205be339b86a1e9cead91f8a02f90;hpb=0f5283a54fd188072eca23fbd980a43c6c869913;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index af1c04a..1dcfd2e 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,65 +1,13 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <fstream>
-#include <iostream>
-#include <msp/strings/regex.h>
-#include "builder.h"
 #include "component.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
 
-using namespace std;
-using namespace Msp;
-
-SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
-	Target(b, c?&c->get_package():0, n),
-	comp(c)
+SourceFile::SourceFile(Builder &b, const Msp::FS::Path &p):
+	FileTarget(b, p)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
-void SourceFile::find_depends()
+SourceFile::SourceFile(Builder &b, const Component &c, const Msp::FS::Path &p):
+	FileTarget(b, c.get_package(), p)
 {
-	if(!comp)
-		return;
-
-	DependencyCache &deps_cache=comp->get_package().get_deps_cache();
-	if(mtime>deps_cache.get_mtime())
-	{
-		ifstream in(name.c_str());
-		if(!in) return;
-
-		if(builder.get_verbose()>=4)
-			cout<<"Reading includes from "<<name<<'\n';
-
-		Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-		string line;
-		while(getline(in, line))
-			if(RegMatch match=r_include.match(line))
-				includes.push_back(match[1].str);
-
-		deps_cache.set_deps(name, includes);
-	}
-	else
-		includes=deps_cache.get_deps(name);
-
-	const StringList &incpath=comp->get_build_info().incpath;
-
-	string path=name.substr(0, name.rfind('/'));
-	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
-	{
-		Target *hdr=builder.get_header(*i, path, incpath);
-		if(hdr)
-			add_depend(hdr);
-	}
-
-	deps_ready=true;
+	component = &c;
 }