Move package management to a separate class

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 44bf878b4efa1e1b24d4793b669a1b08e5b342dc..99b380497b7422809dcb9d686e518a6aec83f543 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -10,8 +10,11 @@
 #include "architecture.h"
 #include "config.h"
 #include "misc.h"
+#include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
+#include "toolchain.h"
+#include "virtualfilesystem.h"
 
 class Analyzer;
 class Config;
@@ -54,32 +57,27 @@ 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;
-       TargetMap targets_by_path;
        TargetList new_tgts;
-       TargetMap includes;
-       TargetMap libraries;
 
        Architecture native_arch;
        Architecture *current_arch;
        StringMap cross_prefixes;
        ProfileTemplateMap profile_tmpl;
+       Toolchain toolchain;
+       VirtualFileSystem vfs;
 
        ProblemList problems;
        Analyzer *analyzer;
@@ -109,36 +107,15 @@ public:
        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;
 
-       FileTarget *get_target_by_path(const Msp::FS::Path &) const;
-
        const TargetMap &get_targets() const { return targets; }
 
-       /** Tries to locate a header based on location of including file and include
-       path.  Considers known targets as well as existing files.  If a matching
-       target is not found but a file exists, a new SystemHeader target will be
-       created and returned. */
-       Target *get_header(const std::string &, const Msp::FS::Path &, const StringList &);
-
-       /** Tries to locate a library in a library path.  The library name should be
-       the same as would be given to the linker with -l, i.e. without the "lib"
-       prefix or extension.  Considers known targets as well as existing files.  If
-       a matching target is not found but a file exists, a new SystemLibrary target
-       will be created and returned. */
-       Target *get_library(const std::string &, const StringList &, LibMode);
-
        const Msp::FS::Path &get_cwd() const { return cwd; }
        const Architecture &get_current_arch() const { return *current_arch; }
        const Architecture &get_native_arch() const { return native_arch; }
@@ -146,6 +123,9 @@ public:
        const StringList &get_warnings() const { return warnings; }
        void apply_profile_template(Config &, const std::string &) const;
 
+       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 *);
@@ -155,29 +135,16 @@ 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. */
        int create_targets();
 
-       /**
-       Check if a header exists, either as a target or a file.  Returns an existing
-       target of one was found, or a new SystemHeader target if there was no known
-       target but the file exists.
-       */
-       Target *get_header(const Msp::FS::Path &);
-
-       Target *get_library(const std::string &, const Msp::FS::Path &, LibMode);
-
        /** Supervises the build process, starting new actions when slots become
        available. */
        int do_build();