Replace the overly generic configuration profiles with something more purposeful

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 4192fe767a7dfdc788a050298d6ead0dbbaad2e9..4b0bee33494636b2d5bb6392a001f458f728f4a8 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,6 +8,7 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include "architecture.h"
+#include "buildtype.h"
 #include "config.h"
 #include "logger.h"
 #include "misc.h"
@@ -39,26 +40,16 @@ private:
        private:
                void architecture(const std::string &);
                void binpkg(const std::string &);
+               void build_type(const std::string &);
                void profile(const std::string &);
                void package(const std::string &);
        };
 
-       class ProfileLoader: public Msp::DataFile::Loader
-       {
-       private:
-               StringMap &profile;
-
-       public:
-               ProfileLoader(StringMap &);
-       private:
-               void option(const std::string &, const std::string &);
-       };
-
 public:
        typedef std::map<std::string, Target *> TargetMap;
 
 private:
-       typedef std::map<std::string, StringMap> ProfileTemplateMap;
+       typedef std::map<std::string, BuildType> BuildTypeMap;
 
        StringList cmdline_targets;
        StringMap cmdline_options;
@@ -71,7 +62,8 @@ private:
 
        Architecture native_arch;
        Architecture *current_arch;
-       ProfileTemplateMap profile_tmpl;
+       BuildTypeMap build_types;
+       BuildType *build_type;
        Toolchain toolchain;
        VirtualFileSystem vfs;
        Logger logger;
@@ -116,7 +108,6 @@ public:
        const Architecture &get_native_arch() const { return native_arch; }
        const Msp::FS::Path &get_prefix() const { return prefix; }
        const StringList &get_warnings() const { return warnings; }
-       void apply_profile_template(Config &, const std::string &) const;
 
        const Toolchain &get_toolchain() const { return toolchain; }
        VirtualFileSystem &get_vfs() { return vfs; }