Redesign how tools are run

[builder.git] / source / gnucompiler.h

diff --git a/source/gnucompiler.h b/source/gnucompiler.h
index 9f0304d82daa0408c4ae3817b36d7b828a5d4ee7..8257dd83576e7236233cc88ef49ac92bcb89e42e 100644 (file)
--- a/source/gnucompiler.h
+++ b/source/gnucompiler.h
@@ -3,6 +3,8 @@
 
 #include "tool.h"
 
+class ObjectFile;
+
 /**
 Common base class for GNU compilers.  Turns SourceFiles into ObjectFiles.
 
@@ -13,17 +15,23 @@ appropriate type.
 class GnuCompiler: public Tool
 {
 protected:
-       std::string version;
+       unsigned version;
 
+public:
        GnuCompiler(Builder &, const Architecture &, const std::string &);
 
-public:
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual std::string create_build_signature(const BuildInfo &) const;
+       Target *create_source(const Component &, const Msp::FS::Path &) const override;
+       Target *create_source(const Msp::FS::Path &) const override;
+       Target *create_target(const std::vector<Target *> &, const std::string &) override;
+       std::string create_build_signature(const BuildInfo &) const override;
 protected:
-       virtual void do_prepare();
-public:
-       virtual Task *run(const Target &) const;
+       void do_prepare() override;
+       void prepare_syspath();
+       void prepare_version();
+       void prepare_version(const std::string &);
+
+private:
+       static Task *_run(const ObjectFile &);
 };
 
 #endif