Further changes for library compatibility

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index a5cacce44e92b2df956c1f593bcab082aee8fba5..bc2d993f819d1dbed22c7ca868697e3dd4f0139e 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -5,9 +5,9 @@ Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
+#include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
+#include <msp/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -17,28 +17,36 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-SourceFile::SourceFile(Builder &b, const Component *c, const FS::Path &p):
-       FileTarget(b, (c ? &c->get_package() : 0), p),
-       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()
 {
        if(!comp)
+       {
+               deps_ready = true;
                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;
+       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;
+                       includes = deps_cache.get_deps(relname);
+                       deps_found = true;
                }
-               catch(const KeyError &)
+               catch(const key_error &)
                { }
        }
 
@@ -46,35 +54,38 @@ void SourceFile::find_depends()
        {
                try
                {
-                       IO::BufferedFile in(name);
+                       IO::BufferedFile in(path.str());
 
                        if(builder.get_verbose()>=4)
-                               cout<<"Reading includes from "<<name<<'\n';
+                               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))
+                               if(RegMatch match = r_include.match(line))
                                        includes.push_back(match[1].str);
 
                        deps_cache.set_deps(relname, includes);
                }
-               catch(const IO::FileNotFound &)
+               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;
+       const StringList &incpath = comp->get_build_info().incpath;
 
-       FS::Path dir=FS::dirname(path);
+       FS::Path dir = FS::dirname(path);
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr=builder.get_header(*i, dir, incpath);
+               Target *hdr = builder.get_header(*i, dir, incpath);
                if(hdr)
                        add_depend(hdr);
        }
 
-       deps_ready=true;
+       deps_ready = true;
 }