Split class Package into SourcePackage and BinaryPackage

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 55910a64823742b12f45b259289ebae5270daa6c..718a09c48541152d3c15f484b5048ce81017f94e 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,8 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <fstream>
-#include <msp/regex++/regex++.h>
+#include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -12,23 +20,43 @@ SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
        comp(c)
 { }
 
+/**
+Parses include directives from the file and looks up the appropriate targets
+from Builder.
+*/
 void SourceFile::find_depends()
 {
-       ifstream in(name.c_str());
-       if(!in) return;
+       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;
 
-       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+               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());
+               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;
+       const string &arch=comp->get_package().get_arch();
 
        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, comp->get_build_info().incpath);
+               Target *hdr=builder.get_header(*i, arch, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }
+
+       deps_ready=true;
 }