X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=1dcfd2e6b3c7b588088a03d703aa9d3a24224154;hb=74ea8208bb1aa1d9afc9657a4cdfac6714241887;hp=6fd8eb8d56514819f6c52bc3d25207e11ecbcad7;hpb=b1f8964a6b466f9b0c86e82706bf9e72133ecfcf;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 6fd8eb8..1dcfd2e 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,88 +1,13 @@
-#include <msp/core/maputils.h>
-#include <msp/fs/utils.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 FS::Path &p):
-	FileTarget(b, 0, p),
-	comp(0)
+SourceFile::SourceFile(Builder &b, const Msp::FS::Path &p):
+	FileTarget(b, p)
 { }
 
-SourceFile::SourceFile(Builder &b, const Component &c, const FS::Path &p):
-	FileTarget(b, &c.get_package(), p),
-	comp(&c)
-{
-	string ext = FS::extpart(FS::basename(path));
-	if(ext==".h" || ext==".H" || ext==".hpp")
-		install_location = "include/"+comp->get_name();
-}
-
-void SourceFile::find_depends()
+SourceFile::SourceFile(Builder &b, const Component &c, const Msp::FS::Path &p):
+	FileTarget(b, c.get_package(), p)
 {
-	if(!comp)
-	{
-		deps_ready = true;
-		return;
-	}
-
-	const SourcePackage &spkg = comp->get_package();
-	string relname = FS::relative(path, 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 key_error &)
-		{ }
-	}
-
-	if(!deps_found)
-	{
-		try
-		{
-			IO::BufferedFile in(path.str());
-
-			if(builder.get_verbose()>=4)
-				IO::print("Reading includes from %s\n", path.str());
-
-			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::file_not_found &)
-		{
-			if(builder.get_verbose()>=4)
-				IO::print("Failed to read includes from %s\n", path.str());
-			deps_ready = true;
-			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_vfs().find_header(*i, dir, incpath);
-		if(hdr)
-			add_depend(hdr);
-	}
-
-	deps_ready = true;
+	component = &c;
 }