X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.h;h=ca19c6f17b522cda1565371c60cbc0e97304f3df;hb=c8c51fac9453a677fc3e6932c4730f35e237af89;hp=2f8c25b4f56aedc10a45090215995c64f5ba7410;hpb=4e2a160d94ca808cfb511cc2d38e115d989809f2;p=builder.git diff --git a/source/tool.h b/source/tool.h index 2f8c25b..ca19c6f 100644 --- a/source/tool.h +++ b/source/tool.h @@ -1,10 +1,13 @@ #ifndef TOOL_H_ #define TOOL_H_ -#include +#include #include +#include #include #include "buildinfo.h" +#include "internaltask.h" +#include "virtualfilesystem.h" class Architecture; class Builder; @@ -12,7 +15,6 @@ class BuildInfo; class Component; class FileTarget; class Target; -class Task; /** Base class for tools. Tools are used to turn targets into other targets. @@ -28,34 +30,46 @@ public: COMPONENT }; - typedef std::list SearchPath; - typedef std::list SuffixList; - protected: Builder &builder; - const Architecture *architecture; + const Architecture *architecture = 0; std::string tag; std::string command; - FileTarget *executable; - SuffixList input_suffixes; - SuffixList aux_suffixes; - ProcessingUnit processing_unit; - SearchPath system_path; + FileTarget *executable = 0; + std::vector input_suffixes; + std::vector aux_suffixes; + ProcessingUnit processing_unit = ONE_FILE; + VirtualFileSystem::SearchPath system_path; BuildInfo build_info; - bool prepared; - std::list problems; - - Tool(Builder &, const std::string &); - Tool(Builder &, const Architecture &, const std::string &); + std::function run_func; + bool prepared = false; + std::vector problems; + + Tool(Builder &b, const std::string &t): Tool(b, 0, t) { } + Tool(Builder &b, const Architecture &a, const std::string &t): Tool(b, &a, t) { } +private: + Tool(Builder &b, const Architecture *a, const std::string &t): builder(b), architecture(a), tag(t) { } public: virtual ~Tool() { } + Builder &get_builder() const { return builder; } + const std::string &get_tag() const { return tag; } - /** Returns the architecture this tool build for. May return null if the + /** Returns the architecture this tool builds for. May return null if the tool is architecture-agnostic. */ const Architecture *get_architecture() const { return architecture; } +protected: + void set_run(std::function); + + template + void set_run(Task *(*)(const T &)); + + template + void set_run_internal(bool (*)(const T &)); + +public: /** Overrides the command used by the tool. The new command should accept the same command line arguments. Only works on tools that use an external command. If cross is true and the architecture is not native, a cross @@ -68,11 +82,11 @@ public: FileTarget *get_executable() const { return executable; } /// Returns a list of suffixes that can be processed with this tool. - const SuffixList &get_input_suffixes() const { return input_suffixes; } + const std::vector &get_input_suffixes() const { return input_suffixes; } /** Returns a list of suffixes that are associated with this tool, but can't be processed directly. For example C and C++ headers. */ - const SuffixList &get_auxiliary_suffixes() const { return aux_suffixes; } + const std::vector &get_auxiliary_suffixes() const { return aux_suffixes; } /** Indicates whether the tool can accept a suffix. If aux is true, auxiliary suffixes are considered as well */ @@ -82,7 +96,7 @@ public: ProcessingUnit get_processing_unit() const { return processing_unit; } /// Returns the systemwide search path for source files. - const SearchPath &get_system_path() const { return system_path; } + const VirtualFileSystem::SearchPath &get_system_path() const { return system_path; } /** Returns tool-specific build info. This can be used by other tools down the chain. */ @@ -102,13 +116,13 @@ public: /** Creates a target from sources. The exact types of accepted sources depends on the tool. The optional second argument can be used to select an alternative target type for tools that can create multiple kinds of targets. */ - virtual Target *create_target(const std::list &, const std::string & = std::string()) = 0; + virtual Target *create_target(const std::vector &, const std::string & = std::string()) = 0; /** Creates an install target for a target created by this tool. Can return null if the tool does not want to handle installing in a special way. */ virtual Target *create_install(Target &) const { return 0; } - virtual std::string create_build_signature(const BuildInfo &) const { return std::string(); } + virtual std::string create_build_signature(const BuildInfo &) const; void prepare(); @@ -116,25 +130,28 @@ protected: virtual void do_prepare() { } public: - const std::list &get_problems() const { return problems; } + const std::vector &get_problems() const { return problems; } /** Invokes the tool to build a target. This should not be called directly; use Target::build() instead. */ - virtual Task *run(const Target &) const = 0; + Task *run(const Target &t) const { return run_func(t); } }; -/** -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 + +template +void Tool::set_run(Task *(*f)(const T &)) { -protected: - Tool &parent; + set_run([f](const Target &t){ return f(dynamic_cast(t)); }); +} - SubTool(Tool &); -}; +template +void Tool::set_run_internal(bool (*f)(const T &)) +{ + set_run([f](const Target &t){ + const T &ct = dynamic_cast(t); + return new InternalTask([f, &ct]{ return f(ct); }); + }); +} void operator>>(const Msp::LexicalConverter &, Tool::ProcessingUnit &);