Convert all fstreams to IO::Files

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index f05d2035edb534b62ac8a56bc06c9bfd5b8b010c..cf74356e72331e3f1a84c68f2afabc174f518d00 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -5,8 +5,9 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
 #include <iostream>
+#include <msp/fs/utils.h>
+#include <msp/io/except.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -30,34 +31,51 @@ void SourceFile::find_depends()
        if(!comp)
                return;
 
-       DependencyCache &deps_cache=comp->get_package().get_deps_cache();
-       if(mtime>deps_cache.get_mtime())
+       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())
        {
-               ifstream in(name.c_str());
-               if(!in) return;
+               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';
+                       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(getline(in, line))
-                       if(RegMatch match=r_include.match(line))
-                               includes.push_back(match[1].str);
+                       string line;
+                       while(in.getline(line))
+                               if(RegMatch match=r_include.match(line))
+                                       includes.push_back(match[1].str);
 
-               deps_cache.set_deps(name, includes);
+                       deps_cache.set_deps(relname, includes);
+               }
+               catch(const IO::FileNotFound &)
+               {
+                       return;
+               }
        }
-       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, arch, path, incpath);
+               Target *hdr=builder.get_header(*i, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }