X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=496132f7a5266523e92777e0558aeb79b62b57cb;hb=92d81529ec8f3b84f5471162d0b27914eff7adb5;hp=3aa2db3c713716ba7d90bcafa715afe368a37302;hpb=6c2db179b5d94ddc32ba1a9b631d59d056e594fc;p=builder.git diff --git a/source/tool.cpp b/source/tool.cpp index 3aa2db3..496132f 100644 --- a/source/tool.cpp +++ b/source/tool.cpp @@ -12,6 +12,7 @@ Tool::Tool(Builder &b, const string &t): architecture(0), tag(t), executable(0), + processing_unit(ONE_FILE), prepared(false) { } @@ -20,6 +21,7 @@ Tool::Tool(Builder &b, const Architecture &a, const string &t): architecture(&a), tag(t), executable(0), + processing_unit(ONE_FILE), prepared(false) { } @@ -62,7 +64,10 @@ void Tool::prepare() { executable = builder.get_vfs().find_binary(command); if(!executable) + { + builder.get_logger().log("problems", format("Can't find executable %s for %s", command, tag)); problems.push_back(format("Can't find executable %s", command)); + } } } @@ -71,3 +76,42 @@ SubTool::SubTool(Tool &p): Tool(p), parent(p) { } + +Target *SubTool::create_source(const Component &c, const FS::Path &p) const +{ + return parent.create_source(c, p); +} + +Target *SubTool::create_source(const FS::Path &p) const +{ + return parent.create_source(p); +} + +Target *SubTool::create_target(const list &s, const string &a) +{ + return parent.create_target(s, a); +} + +Target *SubTool::create_install(Target &t) const +{ + return parent.create_install(t); +} + +string SubTool::create_build_signature(const BuildInfo &bi) const +{ + return parent.create_build_signature(bi); +} + + +void operator>>(const LexicalConverter &conv, Tool::ProcessingUnit &unit) +{ + const string &str = conv.get(); + if(str=="FILE") + unit = Tool::ONE_FILE; + else if(str=="DIRECTORY") + unit = Tool::DIRECTORY; + else if(str=="COMPONENT") + unit = Tool::COMPONENT; + else + throw lexical_error(format("conversion of '%s' to ProcessingUnit", str)); +}