Fix whitespace errors

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index af31f6942c4bf6117eead01cec3943628f60d2f6..66194a27c3e4cf3dccf81a6aacc2dee2b31fd9b0 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"
@@ -42,20 +42,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;
@@ -63,6 +59,7 @@ private:
        BuildType *build_type;
        Toolchain toolchain;
        VirtualFileSystem vfs;
+       BuildGraph build_graph;
        Logger logger;
 
        ProblemList problems;
@@ -74,7 +71,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;
@@ -93,14 +90,9 @@ public:
 
        PackageManager &get_package_manager() { return package_manager; }
 
-       /** 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; }
 
@@ -108,23 +100,13 @@ public:
        VirtualFileSystem &get_vfs() { return vfs; }
        const Logger &get_logger() const { return logger; }
 
-       /** Adds a target.  It can later be retrieved by name.  Called from Target
-       constructor. */
-       void add_target(Target *);
-
-       /** Adds a target that is a primary build goal.  Such targets will be added
-       as dependencies of the "world" virtual target.  If the target belongs to a
-       default component of the main package, it's also added to the "default"
-       virtual target. */
-       void add_primary_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 &);
+       void load_build_file(const Msp::FS::Path &);
 
 private:
        /** Prepares packages and targets for building.  Returns true if everything