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"
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();
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]+([\"<].*)[\">]");
}
catch(const IO::FileNotFound &)
{
+ // XXX WTF?
return;
}
}
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);
}