Change mspparser -> mspdatafile

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 830d356b28959c1d35e22c5eedbc1959256f7d5f..d2d7598eda39445aa14596d421c67f1e64e27d2a 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
@@ -5,13 +12,14 @@
 #include <map>
 #include <string>
 #include <msp/core/application.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/path.h>
 #include "config.h"
 #include "misc.h"
 #include "target.h"
 
 class Analyzer;
+class Config;
 class Package;
 
 /**
@@ -25,35 +33,41 @@ public:
        bool     get_dry_run() const   { return dry_run; }
        bool     get_build_all() const { return build_all; }
        Package  *get_package(const std::string &);
-       Target   *get_target(const std::string &);
-       Target   *get_header(const std::string &, const std::string &, const StringList &);
-       Target   *get_library(const std::string &, const StringList &, unsigned);
+       Package  *get_default_package() const { return default_pkg; }
+       Target   *get_target(const std::string &) const;
+       const TargetMap &get_targets() const { return targets; }
+       Target   *get_header(const std::string &, const std::string &, const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const std::string &, const StringList &, LibMode);
        const Msp::Path::Path &get_cwd() const { return cwd; }
+       const std::string &get_arch_prefix(const std::string &) const;
+       std::string get_tool(const std::string &, const std::string &);
+       void     apply_profile_template(Config &, const std::string &) const;
+       void     add_target(Target *);
        int      main();
        ~Builder();
 
        static void usage(const char *, const char *, bool);
 private:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader
        {
        public:
                Loader(Builder &, const Msp::Path::Path &);
        private:
                Builder         &bld;
                Msp::Path::Path src;
-               
+
                void package(const std::string &);
        };
 
        typedef std::list<Package *>               PackageList;
        typedef std::map<std::string, Package *>   PackageMap;
-       typedef std::map<std::string, Target *>    TargetMap;
-       typedef std::map<std::string, std::string> ToolMap;
-       
+       typedef std::map<std::string, StringMap>   ToolMap;
+       typedef std::map<std::string, StringMap>   ProfileTemplateMap;
+
        StringList   cmdline_targets;
-       RawOptionMap cmdline_options;
+       StringMap    cmdline_options;
        Msp::Path::Path cwd;
-       
+
        PackageMap   packages;
        PackageList  new_pkgs;
        Package      *default_pkg;
@@ -63,10 +77,13 @@ private:
        TargetMap    includes;
        TargetMap    libraries;
 
-       ToolMap      tools;    /// Not used yet
-       
+       ToolMap      tools;    //< arch, tool name -> program name
+       StringMap    archs;    //< arch -> prefix
+       ProfileTemplateMap profile_tmpl;
+
        Analyzer        *analyzer;
-       bool            do_build;
+       bool            build;
+       unsigned        clean;
        bool            dry_run;
        bool            help;
        unsigned        verbose;
@@ -77,16 +94,18 @@ private:
        bool            conf_all;
        bool            conf_only;
        bool            build_all;
+       bool            create_makefile;
 
        int    load_build_file(const Msp::Path::Path &);
        int    create_targets();
        Target *get_header(const Msp::Path::Path &);
-       Target *get_library(const std::string &, const Msp::Path::Path &, unsigned);
-       void   add_target(Target *);
+       Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
        void   update_hash(std::string &, const std::string &);
-       int    build();
+       int    do_build();
+       int    do_clean();
+       int    do_create_makefile();
        void   package_help();
-       
+
        static Msp::Application::RegApp<Builder> reg;
 };