Refactor FileTarget and SourceFile constructors

[builder.git] / source / tool.h

diff --git a/source/tool.h b/source/tool.h
index 1905555e1818955515a25fe8b1fbca2e5149630a..4bbbcf5595a8f3603e85901fb5bdb88503cba6f2 100644 (file)
--- a/source/tool.h
+++ b/source/tool.h
@@ -5,11 +5,17 @@
 #include <string>
 #include <msp/fs/path.h>
 
+class Architecture;
 class Builder;
 class Component;
+class FileTarget;
 class Target;
 class Task;
 
+/**
+Base class for tools.  Tools are used to turn targets into other targets.
+Examples include compilers and linkers.
+*/
 class Tool
 {
 public:
@@ -18,25 +24,44 @@ public:
 
 protected:
        Builder &builder;
+       const Architecture *architecture;
        std::string tag;
+       FileTarget *executable;
        SuffixList input_suffixes;
        SuffixList aux_suffixes;
        SearchPath system_path;
 
        Tool(Builder &, const std::string &);
+       Tool(Builder &, const Architecture &, const std::string &);
 public:
        virtual ~Tool() { }
 
        const std::string &get_tag() const { return tag; }
+       // XXX The executable target should be retrieved when first needed
+       FileTarget *get_executable() const { return executable; }
        const SuffixList &get_input_suffixes() const { return input_suffixes; }
        const SuffixList &get_auxiliary_suffixes() const { return aux_suffixes; }
        bool accepts_suffix(const std::string &, bool = false) const;
        const SearchPath &get_system_path() const { return system_path; }
 
        virtual Target *create_source(const Component &, const Msp::FS::Path &) const { return 0; }
+       virtual Target *create_source(const Msp::FS::Path &) const { return 0; }
        Target *create_target(Target &, const std::string & = std::string()) const;
        virtual Target *create_target(const std::list<Target *> &, const std::string & = std::string()) const = 0;
        virtual Task *run(const Target &) const = 0;
 };
 
+/**
+Intermediate base class for tool facets.  For example, a linker may need to
+use different commands depending on whether C++ source files are present or
+not, but their presence can't be directly determined from the object files.
+*/
+class SubTool: public Tool
+{
+protected:
+       Tool &parent;
+
+       SubTool(Tool &);
+};
+
 #endif