Rework the Target class hierarchy

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 55910a64823742b12f45b259289ebae5270daa6c..cadd1330e0bc94b2816e6b26268b5d0a195e5efb 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,34 +1,80 @@
-#include <fstream>
-#include <msp/regex++/regex++.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <iostream>
+#include <msp/fs/utils.h>
+#include <msp/io/except.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 string &n):
-       Target(b, c?&c->get_package():0, n),
+SourceFile::SourceFile(Builder &b, const Component *c, const FS::Path &p):
+       FileTarget(b, (c ? &c->get_package() : 0), p),
        comp(c)
 { }
 
 void SourceFile::find_depends()
 {
-       ifstream in(name.c_str());
-       if(!in) return;
+       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)
+                               cout<<"Reading includes from "<<name<<'\n';
+
+                       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
-       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);
 
-       string line;
-       while(getline(in, 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;
 
-       string path=name.substr(0, name.rfind('/'));
+       FS::Path dir=FS::dirname(path);
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr=builder.get_header(*i, path, comp->get_build_info().incpath);
+               Target *hdr=builder.get_header(*i, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }
+
+       deps_ready=true;
 }