Use ObjectLoaders where appropriate

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index fc160d3220a971a903a5495b3bb76ac43a4e81dc..e524864564cfee83b64d59acddea2709eb334b6e 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -9,7 +9,9 @@
 #include <msp/fs/path.h>
 #include "architecture.h"
 #include "config.h"
+#include "logger.h"
 #include "misc.h"
+#include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
 #include "toolchain.h"
@@ -28,10 +30,9 @@ The main application class.  Controls and owns everything.  Rules the world.
 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:
@@ -56,24 +57,19 @@ private:
 
 public:
        typedef std::map<std::string, Target *> TargetMap;
+       typedef std::list<Target *> TargetList;
 
 private:
-       typedef std::list<Package *> PackageList;
-       typedef std::map<std::string, Package *> PackageMap;
        typedef std::map<std::string, StringMap> ProfileTemplateMap;
 
        StringList cmdline_targets;
        StringMap cmdline_options;
        Msp::FS::Path cwd;
 
-       PackageMap packages;
+       PackageManager package_manager;
        SourcePackage *main_pkg;
-       PathList pkg_path;
-       PathList pkg_dirs;
-       bool no_externals;
 
        TargetMap targets;
-       TargetList new_tgts;
 
        Architecture native_arch;
        Architecture *current_arch;
@@ -81,6 +77,7 @@ private:
        ProfileTemplateMap profile_tmpl;
        Toolchain toolchain;
        VirtualFileSystem vfs;
+       Logger logger;
 
        ProblemList problems;
        Analyzer *analyzer;
@@ -88,7 +85,6 @@ private:
        unsigned clean;
        bool dry_run;
        bool help;
-       unsigned verbose;
        bool show_progress;
        std::string build_file;
        unsigned jobs;
@@ -108,18 +104,11 @@ public:
        ~Builder();
 
        int main();
-       unsigned get_verbose() const { return verbose; }
        bool get_dry_run() const { return dry_run; }
-       bool get_build_all() const { return build_all; }
-
-       /** Gets a package by name, possibly creating it.  Returns 0 if the package
-       could not be located. */
-       Package *get_package(const std::string &);
 
+       PackageManager &get_package_manager() { return package_manager; }
        SourcePackage *get_main_package() const { return main_pkg; }
 
-       std::string run_pkgconfig(const std::string &, const std::string &);
-
        /** Looks up a target by name.  Returns 0 if no such target exists. */
        Target *get_target(const std::string &) const;
 
@@ -134,6 +123,7 @@ public:
 
        const Toolchain &get_toolchain() const { return toolchain; }
        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. */
@@ -144,15 +134,11 @@ public:
 
        static void usage(const char *, const char *, bool);
 
-private:
-       /** Determines the source directory of a package.  Pkg-config is consulted
-       first, and if it fails, the package path is searched for matches. */
-       Msp::FS::Path get_package_location(const std::string &);
-
        /** 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 &);
 
+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. */