Migrate from msppath to mspfs

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 6da42a1a90e94c55ca080157c3ae6fcdba1a31d2..2bfa32a429c7c9c137c19312616cd0f42972c643 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -13,9 +13,11 @@ Distributed under the LGPL
 #include <string>
 #include <msp/core/application.h>
 #include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/fs/path.h>
+#include "architecture.h"
 #include "config.h"
 #include "misc.h"
+#include "problem.h"
 #include "target.h"
 
 class Analyzer;
@@ -34,16 +36,19 @@ public:
        bool     get_dry_run() const   { return dry_run; }
        bool     get_build_all() const { return build_all; }
        Package  *get_package(const std::string &);
-       SourcePackage *get_default_package() const { return default_pkg; }
+       SourcePackage *get_main_package() const { return main_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 &);
+       Target   *get_header(const std::string &, const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const StringList &, LibMode);
+       const Msp::FS::Path &get_cwd() const { return cwd; }
+       const Architecture &get_architecture(const std::string &) const;
+       const Architecture &get_current_arch() const;
+       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;
        void     add_target(Target *);
+       void     problem(const std::string &, const std::string &);
        int      main();
        ~Builder();
 
@@ -52,12 +57,12 @@ private:
        class Loader: public Msp::DataFile::Loader
        {
        public:
-               Loader(Builder &, const Msp::Path::Path &);
+               Loader(Builder &, const Msp::FS::Path &);
        private:
-               Builder         &bld;
-               Msp::Path::Path src;
+               Builder       &bld;
+               Msp::FS::Path src;
 
-               void architecture(const std::string &, const std::string &);
+               void architecture(const std::string &);
                void binpkg(const std::string &);
                void profile(const std::string &);
                void package(const std::string &);
@@ -75,32 +80,31 @@ private:
 
        typedef std::list<Package *>               PackageList;
        typedef std::map<std::string, Package *>   PackageMap;
-       typedef std::map<std::string, StringMap>   ToolMap;
        typedef std::map<std::string, StringMap>   ProfileTemplateMap;
 
        StringList   cmdline_targets;
        StringMap    cmdline_options;
-       Msp::Path::Path cwd;
+       Msp::FS::Path cwd;
 
        PackageMap   packages;
-       SourcePackage *default_pkg;
+       SourcePackage *main_pkg;
 
        TargetMap    targets;
        TargetList   new_tgts;
        TargetMap    includes;
        TargetMap    libraries;
 
-       ToolMap      tools;    //< arch, tool name -> program name
-       StringMap    archs;    //< arch -> prefix
+       ArchMap      archs;
        ProfileTemplateMap profile_tmpl;
 
+       ProblemList     problems;
        Analyzer        *analyzer;
        bool            build;
        unsigned        clean;
        bool            dry_run;
        bool            help;
        unsigned        verbose;
-       bool            chrome;
+       bool            show_progress;
        std::string     build_file;
        unsigned        jobs;
        StringList      what_if;
@@ -108,11 +112,14 @@ private:
        bool            conf_only;
        bool            build_all;
        bool            create_makefile;
+       std::string     current_arch;
+       Msp::FS::Path   prefix;
+       StringList      warnings;
 
-       int    load_build_file(const Msp::Path::Path &);
+       int    load_build_file(const Msp::FS::Path &);
        int    create_targets();
-       Target *get_header(const Msp::Path::Path &);
-       Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
+       Target *get_header(const Msp::FS::Path &);
+       Target *get_library(const std::string &, const Msp::FS::Path &, LibMode);
        void   update_hash(std::string &, const std::string &);
        int    do_build();
        int    do_clean();