Fix whitespace errors

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 400be8a5de392fb0d37ad54db5e55b7db9650001..66194a27c3e4cf3dccf81a6aacc2dee2b31fd9b0 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -5,74 +5,128 @@
 #include <map>
 #include <string>
 #include <msp/core/application.h>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#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 "packagemanager.h"
+#include "problem.h"
+#include "target.h"
+#include "toolchain.h"
+#include "virtualfilesystem.h"
 
 class Analyzer;
+class FileTarget;
 class Package;
-class Target;
+class SourcePackage;
 
-class Builder: public Msp::Application
+/**
+The main application class.  Handles command line options and supervises the
+build process.
+*/
+class Builder: public Msp::RegisteredApplication<Builder>
 {
-public:
-       Builder(int, char **);
-       unsigned get_verbose() const { return verbose; }
-       bool     get_dry_run() const { return dry_run; }
-       Package  *get_package(const std::string &);
-       Target   *get_target(const std::string &);
-       Target   *get_header(const std::string &, const std::string &, const std::list<std::string> &);
-       Target   *get_library(const std::string &, const std::list<std::string> &);
-       int      main();
-       ~Builder();
 private:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Builder>
        {
        public:
-               Loader(Builder &, const Msp::Path::Path &);
+               Loader(Builder &);
        private:
-               Builder &bld;
-               Msp::Path::Path src;
-               
+               void architecture(const std::string &);
+               void binpkg(const std::string &);
+               void build_type(const std::string &);
+               void profile(const std::string &);
                void package(const std::string &);
        };
 
-       typedef std::map<std::string, Package *>   PackageMap;
-       typedef std::map<std::string, Target *>    TargetMap;
-       typedef std::map<std::string, std::string> ToolMap;
-       
-       std::list<std::string> cmdline_targets;
-       RawOptionMap cmdline_options;
-       
-       PackageMap  packages;
-       std::list<Package *> new_pkgs;
-       Package     *default_pkg;
-
-       TargetMap   targets;
-       std::list<Target *> new_tgts;
-       TargetMap   includes;
-       TargetMap   libraries;
-
-       ToolMap     tools;
-       unsigned    verbose;
-       Msp::Path::Path cwd;
-       Msp::Path::Path build_file;
-       bool        do_build;
-       bool        dry_run;
-       Analyzer    *analyzer;
-       unsigned    jobs;
-       std::list<std::string> what_if;
-       bool        chrome;
-       bool        conf_all;
-
-       int load_build_file(const Msp::Path::Path &);
-       int create_targets();
-       Target *check_header(const Msp::Path::Path &);
-       void add_target(Target *);
-       void update_hash(std::string &, const std::string &);
-       int build();
-       
-       static Msp::Application::RegApp<Builder> reg;
+private:
+       typedef std::list<std::string> NameList;
+       typedef std::map<std::string, BuildType> BuildTypeMap;
+       typedef std::list<Problem> ProblemList;
+
+       NameList cmdline_targets;
+       Config::InputOptions cmdline_options;
+       Msp::FS::Path cwd;
+
+       PackageManager package_manager;
+
+       Architecture native_arch;
+       Architecture *current_arch;
+       BuildTypeMap build_types;
+       BuildType *build_type;
+       Toolchain toolchain;
+       VirtualFileSystem vfs;
+       BuildGraph build_graph;
+       Logger logger;
+
+       ProblemList problems;
+       Analyzer *analyzer;
+       bool build;
+       unsigned clean;
+       bool dry_run;
+       bool help;
+       bool show_progress;
+       std::string build_file;
+       unsigned jobs;
+       NameList what_if;
+       bool conf_all;
+       bool conf_only;
+       bool build_all;
+       bool create_makefile;
+       Msp::FS::Path prefix;
+       Msp::FS::Path tempdir;
+
+       static std::string usagemsg;
+       static std::string helpmsg;
+
+public:
+       Builder(int, char **);
+       ~Builder();
+
+       int main();
+
+       PackageManager &get_package_manager() { return package_manager; }
+
+       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; }
+
+       const Toolchain &get_toolchain() const { return toolchain; }
+       VirtualFileSystem &get_vfs() { return vfs; }
+       const Logger &get_logger() const { return logger; }
+
+       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. */
+       void load_build_file(const Msp::FS::Path &);
+
+private:
+       /** 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 tasks when slots become
+       available. */
+       int do_build();
+
+       /** Cleans buildable targets.  If clean is 1, cleans only the default
+       package.  If clean is 2 or greater, cleans all buildable packages.
+       */
+       int do_clean();
+
+       int do_create_makefile();
+
+       /** Prints out information about the default package. */
+       void package_help();
 };
 
 #endif