Big rewrite for a more tool-centric approach

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 6835299b4ac464807240565fd231731d80b2edd0..25f06457b624da63f1a011f0d570c6badba03a82 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
@@ -19,6 +12,7 @@ Distributed under the LGPL
 #include "misc.h"
 #include "problem.h"
 #include "target.h"
+#include "toolchain.h"
 
 class Analyzer;
 class Config;
@@ -30,7 +24,7 @@ class VirtualTarget;
 /**
 The main application class.  Controls and owns everything.  Rules the world.
 */
-class Builder: public Msp::Application
+class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
        class Loader: public Msp::DataFile::Loader
@@ -59,6 +53,10 @@ private:
                void option(const std::string &, const std::string &);
        };
 
+public:
+       typedef std::map<std::string, Target *> TargetMap;
+
+private:
        typedef std::list<Package *> PackageList;
        typedef std::map<std::string, Package *> PackageMap;
        typedef std::map<std::string, StringMap> ProfileTemplateMap;
@@ -74,6 +72,7 @@ private:
        bool no_externals;
 
        TargetMap targets;
+       TargetMap targets_by_path;
        TargetList new_tgts;
        TargetMap includes;
        TargetMap libraries;
@@ -82,6 +81,7 @@ private:
        Architecture *current_arch;
        StringMap cross_prefixes;
        ProfileTemplateMap profile_tmpl;
+       Toolchain toolchain;
 
        ProblemList problems;
        Analyzer *analyzer;
@@ -101,7 +101,6 @@ private:
        Msp::FS::Path prefix;
        StringList warnings;
 
-       static Msp::Application::RegApp<Builder> reg;
        static std::string usagemsg;
        static std::string helpmsg;
 
@@ -125,6 +124,8 @@ public:
        /** Looks up a target by name.  Returns 0 if no such target exists. */
        Target *get_target(const std::string &) const;
 
+       FileTarget *get_target_by_path(const Msp::FS::Path &) const;
+
        const TargetMap &get_targets() const { return targets; }
 
        /** Tries to locate a header based on location of including file and include
@@ -147,10 +148,12 @@ public:
        const StringList &get_warnings() const { return warnings; }
        void apply_profile_template(Config &, const std::string &) const;
 
+       const Toolchain &get_toolchain() const { return toolchain; }
+
        /** Adds a target to both the target map and the new target queue.  Called
        from Target constructor. */
-       void add_target(FileTarget *);
-       void add_target(VirtualTarget *);
+       void add_target(Target *);
+       void register_path(const Msp::FS::Path &, FileTarget *);
 
        void problem(const std::string &, const std::string &);