X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=70ca861bc64cefb22c13c7d91c98eacfbef61a15;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=4c78a3dffd579d1054fa02846c771c3eae62fd3c;hpb=3ab5bb78c8ca2d71d9902dab34209670eac341af;p=builder.git diff --git a/source/builder.h b/source/builder.h index 4c78a3d..70ca861 100644 --- a/source/builder.h +++ b/source/builder.h @@ -12,7 +12,6 @@ #include "config.h" #include "logger.h" #include "packagemanager.h" -#include "problem.h" #include "target.h" #include "toolchain.h" #include "virtualfilesystem.h" @@ -42,13 +41,9 @@ private: 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 &); }; -public: - typedef std::list ProblemList; - private: typedef std::map BuildTypeMap; @@ -64,7 +59,6 @@ private: Logger default_logger; const Logger *logger; - ProblemList problems; Msp::FS::Path prefix; Msp::FS::Path tempdir; @@ -80,6 +74,7 @@ public: const Architecture &get_current_arch() const { return *current_arch; } const Architecture &get_native_arch() const { return native_arch; } void set_build_type(const std::string &); + std::vector get_build_types() const; const BuildType &get_build_type() const { return *build_type; } BuildGraph &get_build_graph() { return build_graph; } void set_prefix(const Msp::FS::Path &); @@ -93,15 +88,15 @@ public: void set_logger(const Logger *); const Logger &get_logger() const { return *logger; } - void problem(const std::string &, const std::string &); - const ProblemList &get_problems() const { return problems; } + std::list collect_problems() const; /** Loads a build file. If opts is not null, it is used to configure any packages loaded from this file. If all is true, external packages are also configured. */ void load_build_file(const Msp::FS::Path &, const Config::InputOptions *opts = 0, bool all = false); - void load_build_file(const Msp::FS::Path &, const Config::InputOptions &, bool); + /** Saves package configuration and dependency caches. */ + void save_caches(); /** Builds the goal targets. The build graph must be prepared first. */ int build(unsigned jobs = 1, bool dry_run = false, bool show_progress = false);