Add install component type

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index cf74356e72331e3f1a84c68f2afabc174f518d00..7425a0f132c893c0448d0954993c1bde0321262f 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,13 +1,13 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+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/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -17,19 +17,23 @@ Distributed under the LGPL
 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)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
 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();
@@ -53,7 +57,7 @@ void SourceFile::find_depends()
                        IO::BufferedFile in(name);
 
                        if(builder.get_verbose()>=4)
-                               cout<<"Reading includes from "<<name<<'\n';
+                               IO::print("Reading includes from %s\n", name);
 
                        Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
@@ -66,16 +70,17 @@ void SourceFile::find_depends()
                }
                catch(const IO::FileNotFound &)
                {
+                       // XXX WTF?
                        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, incpath);
+               Target *hdr=builder.get_header(*i, dir, incpath);
                if(hdr)
                        add_depend(hdr);
        }