Pass the option map through load_build_file and to Loader

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 933fbb05599dd66a01de8d8a147411a9a3c94e0f..3d70968b61525a9cde19e1757838a0375142eca3 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,10 +8,10 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include "architecture.h"
+#include "buildgraph.h"
 #include "buildtype.h"
 #include "config.h"
 #include "logger.h"
-#include "misc.h"
 #include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
@@ -33,10 +33,13 @@ private:
        class Loader: public Msp::DataFile::ObjectLoader<Builder>
        {
        private:
-               Msp::FS::Path src;
+               const Config::InputOptions *options;
+               bool conf_all;
 
        public:
-               Loader(Builder &, const Msp::FS::Path &);
+               Loader(Builder &, const Config::InputOptions * = 0, bool = false);
+               ~Loader();
+
        private:
                void architecture(const std::string &);
                void binpkg(const std::string &);
@@ -45,20 +48,16 @@ private:
                void package(const std::string &);
        };
 
-public:
-       typedef std::map<std::string, Target *> TargetMap;
-
 private:
+       typedef std::list<std::string> NameList;
        typedef std::map<std::string, BuildType> BuildTypeMap;
+       typedef std::list<Problem> ProblemList;
 
-       StringList cmdline_targets;
+       NameList cmdline_targets;
        Config::InputOptions cmdline_options;
        Msp::FS::Path cwd;
 
        PackageManager package_manager;
-       SourcePackage *main_pkg;
-
-       TargetMap targets;
 
        Architecture native_arch;
        Architecture *current_arch;
@@ -66,6 +65,7 @@ private:
        BuildType *build_type;
        Toolchain toolchain;
        VirtualFileSystem vfs;
+       BuildGraph build_graph;
        Logger logger;
 
        ProblemList problems;
@@ -77,7 +77,7 @@ private:
        bool show_progress;
        std::string build_file;
        unsigned jobs;
-       StringList what_if;
+       NameList what_if;
        bool conf_all;
        bool conf_only;
        bool build_all;
@@ -85,6 +85,8 @@ private:
        Msp::FS::Path prefix;
        Msp::FS::Path tempdir;
 
+       Loader *top_loader;
+
        static std::string usagemsg;
        static std::string helpmsg;
 
@@ -93,19 +95,12 @@ public:
        ~Builder();
 
        int main();
-       bool get_dry_run() const { return dry_run; }
 
        PackageManager &get_package_manager() { return package_manager; }
-       SourcePackage *get_main_package() const { return main_pkg; }
-
-       /** Looks up a target by name.  Returns 0 if no such target exists. */
-       Target *get_target(const std::string &) const;
 
-       const TargetMap &get_targets() const { return targets; }
-
-       const Msp::FS::Path &get_work_directory() const { return cwd; }
        const Architecture &get_current_arch() const { return *current_arch; }
        const Architecture &get_native_arch() const { return native_arch; }
+       BuildGraph &get_build_graph() { return build_graph; }
        const Msp::FS::Path &get_prefix() const { return prefix; }
        const Msp::FS::Path &get_temp_directory() const { return tempdir; }
 
@@ -113,17 +108,14 @@ public:
        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 problem(const std::string &, const std::string &);
 
        static void usage(const char *, const char *, bool);
 
-       /** Loads a build file.  Returns 0 on success or -1 if the file could not be
-       opened. */
-       int load_build_file(const Msp::FS::Path &);
+       /** Loads a build file.  If opts is not null, it is used to configure any
+       packages loaded from this file.  If all is true, external packages are also
+       configured. */
+       void load_build_file(const Msp::FS::Path &, const Config::InputOptions *opts = 0, bool all = false);
 
 private:
        /** Prepares packages and targets for building.  Returns true if everything