Move some more functionality into BuildGraph

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 99b380497b7422809dcb9d686e518a6aec83f543..40df4ff3861d85693a669af7a95c4aab482dc280 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,8 +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 "misc.h"
+#include "logger.h"
 #include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
@@ -17,67 +19,48 @@
 #include "virtualfilesystem.h"
 
 class Analyzer;
-class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
-class VirtualTarget;
 
 /**
-The main application class.  Controls and owns everything.  Rules the world.
+The main application class.  Handles command line options and supervises the
+build process.
 */
 class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Builder>
        {
-       private:
-               Builder &bld;
-               Msp::FS::Path src;
-
        public:
-               Loader(Builder &, const Msp::FS::Path &);
+               Loader(Builder &);
        private:
+               void architecture(const std::string &);
                void binpkg(const std::string &);
-               void cross_prefix(const std::string &, 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;
-       typedef std::list<Target *> TargetList;
-
 private:
-       typedef std::map<std::string, StringMap> ProfileTemplateMap;
+       typedef std::list<std::string> NameList;
+       typedef std::map<std::string, BuildType> BuildTypeMap;
+       typedef std::list<Problem> ProblemList;
 
-       StringList cmdline_targets;
-       StringMap cmdline_options;
+       NameList cmdline_targets;
+       Config::InputOptions cmdline_options;
        Msp::FS::Path cwd;
 
        PackageManager package_manager;
-       SourcePackage *main_pkg;
-
-       TargetMap targets;
-       TargetList new_tgts;
 
        Architecture native_arch;
        Architecture *current_arch;
-       StringMap cross_prefixes;
-       ProfileTemplateMap profile_tmpl;
+       BuildTypeMap build_types;
+       BuildType *build_type;
        Toolchain toolchain;
        VirtualFileSystem vfs;
+       BuildGraph build_graph;
+       Logger logger;
 
        ProblemList problems;
        Analyzer *analyzer;
@@ -85,17 +68,16 @@ private:
        unsigned clean;
        bool dry_run;
        bool help;
-       unsigned verbose;
        bool show_progress;
        std::string build_file;
        unsigned jobs;
-       StringList what_if;
+       NameList what_if;
        bool conf_all;
        bool conf_only;
        bool build_all;
        bool create_makefile;
        Msp::FS::Path prefix;
-       StringList warnings;
+       Msp::FS::Path tempdir;
 
        static std::string usagemsg;
        static std::string helpmsg;
@@ -105,31 +87,19 @@ public:
        ~Builder();
 
        int main();
-       unsigned get_verbose() const { return verbose; }
-       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_cwd() const { return cwd; }
+       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 StringList &get_warnings() const { return warnings; }
-       void apply_profile_template(Config &, const std::string &) const;
+       const Msp::FS::Path &get_temp_directory() const { return tempdir; }
 
        const Toolchain &get_toolchain() const { return toolchain; }
        VirtualFileSystem &get_vfs() { return vfs; }
-
-       /** Adds a target to both the target map and the new target queue.  Called
-       from Target constructor. */
-       void add_target(Target *);
-       void register_path(const Msp::FS::Path &, FileTarget *);
+       const Logger &get_logger() const { return logger; }
 
        void problem(const std::string &, const std::string &);
 
@@ -137,15 +107,15 @@ public:
 
        /** 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 &);
+       void load_build_file(const Msp::FS::Path &);
 
 private:
-       /** Creates targets for all packages and prepares them for building.
-       Returns 0 if everything went ok, -1 if something bad happened and a build
-       shouldn't be attempted. */
-       int create_targets();
+       /** Prepares packages and targets for building.  Returns true if everything
+       went ok, or false if something bad happened and a build shouldn't be
+       attempted. */
+       bool prepare_build();
 
-       /** Supervises the build process, starting new actions when slots become
+       /** Supervises the build process, starting new tasks when slots become
        available. */
        int do_build();