Change mspparser -> mspdatafile

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 6985db8cef39697864a60e74801f82e13f64c00f..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,7 +12,7 @@
 #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"
@@ -26,19 +33,22 @@ 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 &);
+       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 &);
@@ -51,7 +61,6 @@ private:
 
        typedef std::list<Package *>               PackageList;
        typedef std::map<std::string, Package *>   PackageMap;
-       typedef std::map<std::string, Target *>    TargetMap;
        typedef std::map<std::string, StringMap>   ToolMap;
        typedef std::map<std::string, StringMap>   ProfileTemplateMap;
 
@@ -91,7 +100,6 @@ private:
        int    create_targets();
        Target *get_header(const Msp::Path::Path &);
        Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
-       void   add_target(Target *);
        void   update_hash(std::string &, const std::string &);
        int    do_build();
        int    do_clean();