Further changes for library compatibility

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 42142536607b9a4540929703ae14383538823ea8..bc2d993f819d1dbed22c7ca868697e3dd4f0139e 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,40 +1,91 @@
-#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 <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 Component *c, const string &n):
-       Target(b, c?&c->get_package():0, n),
-       comp(c)
+SourceFile::SourceFile(Builder &b, const FS::Path &p):
+       FileTarget(b, 0, p),
+       comp(0)
+{ }
+
+SourceFile::SourceFile(Builder &b, const Component &c, const FS::Path &p):
+       FileTarget(b, &c.get_package(), p),
+       comp(&c)
 { }
 
 void SourceFile::find_depends()
 {
-       ifstream in(name.c_str());
-       if(!in) return;
+       if(!comp)
+       {
+               deps_ready = true;
+               return;
+       }
 
-       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+       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 &)
+               { }
+       }
 
-       string line;
-       while(getline(in, line))
-               if(RegMatch match=r_include.match(line))
-                       includes.push_back(match[1].str());
+       if(!deps_found)
+       {
+               try
+               {
+                       IO::BufferedFile in(path.str());
 
-       string path=name.substr(0, name.rfind('/'));
+                       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_header(*i, path, comp->get_build_info().incpath);
+               Target *hdr = builder.get_header(*i, dir, incpath);
                if(hdr)
                        add_depend(hdr);
        }
-}
 
-void SourceFile::check_rebuild()
-{
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
-               vmtime=max(vmtime, (*i)->get_virtual_mtime());
+       deps_ready = true;
 }