Simpler way to check g++ version

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 99b380497b7422809dcb9d686e518a6aec83f543..4192fe767a7dfdc788a050298d6ead0dbbaad2e9 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -9,6 +9,7 @@
 #include <msp/fs/path.h>
 #include "architecture.h"
 #include "config.h"
+#include "logger.h"
 #include "misc.h"
 #include "packagemanager.h"
 #include "problem.h"
@@ -21,7 +22,6 @@ class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
-class VirtualTarget;
 
 /**
 The main application class.  Controls and owns everything.  Rules the world.
@@ -29,17 +29,16 @@ The main application class.  Controls and owns everything.  Rules the world.
 class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Builder>
        {
        private:
-               Builder &bld;
                Msp::FS::Path src;
 
        public:
                Loader(Builder &, const Msp::FS::Path &);
        private:
+               void architecture(const std::string &);
                void binpkg(const std::string &);
-               void cross_prefix(const std::string &, const std::string &);
                void profile(const std::string &);
                void package(const std::string &);
        };
@@ -57,7 +56,6 @@ private:
 
 public:
        typedef std::map<std::string, Target *> TargetMap;
-       typedef std::list<Target *> TargetList;
 
 private:
        typedef std::map<std::string, StringMap> ProfileTemplateMap;
@@ -70,14 +68,13 @@ private:
        SourcePackage *main_pkg;
 
        TargetMap targets;
-       TargetList new_tgts;
 
        Architecture native_arch;
        Architecture *current_arch;
-       StringMap cross_prefixes;
        ProfileTemplateMap profile_tmpl;
        Toolchain toolchain;
        VirtualFileSystem vfs;
+       Logger logger;
 
        ProblemList problems;
        Analyzer *analyzer;
@@ -85,7 +82,6 @@ private:
        unsigned clean;
        bool dry_run;
        bool help;
-       unsigned verbose;
        bool show_progress;
        std::string build_file;
        unsigned jobs;
@@ -105,7 +101,6 @@ public:
        ~Builder();
 
        int main();
-       unsigned get_verbose() const { return verbose; }
        bool get_dry_run() const { return dry_run; }
 
        PackageManager &get_package_manager() { return package_manager; }
@@ -125,11 +120,11 @@ public:
 
        const Toolchain &get_toolchain() const { return toolchain; }
        VirtualFileSystem &get_vfs() { return vfs; }
+       const Logger &get_logger() const { return logger; }
 
        /** Adds a target to both the target map and the new target queue.  Called
        from Target constructor. */
        void add_target(Target *);
-       void register_path(const Msp::FS::Path &, FileTarget *);
 
        void problem(const std::string &, const std::string &);