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

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 0fc6d69..1dcfd2e 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,80 +1,13 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/fs/utils.h>
-#include <msp/io/except.h>
-#include <msp/io/print.h>
-#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 FS::Path &p):
-	FileTarget(b, (c ? &c->get_package() : 0), p),
-	comp(c)
+SourceFile::SourceFile(Builder &b, const Msp::FS::Path &p):
+	FileTarget(b, p)
 { }
 
-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;
-
-	const SourcePackage &spkg=comp->get_package();
-	string relname=FS::relative(name, spkg.get_source()).str();
-	DependencyCache &deps_cache=spkg.get_deps_cache();
-	bool deps_found=false;
-	if(mtime<deps_cache.get_mtime())
-	{
-		try
-		{
-			includes=deps_cache.get_deps(relname);
-			deps_found=true;
-		}
-		catch(const KeyError &)
-		{ }
-	}
-
-	if(!deps_found)
-	{
-		try
-		{
-			IO::BufferedFile in(name);
-
-			if(builder.get_verbose()>=4)
-				IO::print("Reading includes from %s\n", name);
-
-			Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-			string line;
-			while(in.getline(line))
-				if(RegMatch match=r_include.match(line))
-					includes.push_back(match[1].str);
-
-			deps_cache.set_deps(relname, includes);
-		}
-		catch(const IO::FileNotFound &)
-		{
-			return;
-		}
-	}
-
-	const StringList &incpath=comp->get_build_info().incpath;
-
-	FS::Path dir=FS::dirname(path);
-	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
-	{
-		Target *hdr=builder.get_header(*i, dir, incpath);
-		if(hdr)
-			add_depend(hdr);
-	}
-
-	deps_ready=true;
+	component = &c;
 }