Move to a more abstract way of defining warnings

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index cdf615d768383d9691371c2c2e186f7dabad5b4c..933fbb05599dd66a01de8d8a147411a9a3c94e0f 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -19,7 +19,6 @@
 #include "virtualfilesystem.h"
 
 class Analyzer;
-class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
@@ -53,7 +52,7 @@ private:
        typedef std::map<std::string, BuildType> BuildTypeMap;
 
        StringList cmdline_targets;
-       StringMap cmdline_options;
+       Config::InputOptions cmdline_options;
        Msp::FS::Path cwd;
 
        PackageManager package_manager;
@@ -85,7 +84,6 @@ private:
        bool create_makefile;
        Msp::FS::Path prefix;
        Msp::FS::Path tempdir;
-       StringList warnings;
 
        static std::string usagemsg;
        static std::string helpmsg;
@@ -105,12 +103,11 @@ public:
 
        const TargetMap &get_targets() const { return targets; }
 
-       const Msp::FS::Path &get_cwd() const { return cwd; }
+       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; }
        const Msp::FS::Path &get_prefix() const { return prefix; }
        const Msp::FS::Path &get_temp_directory() const { return tempdir; }
-       const StringList &get_warnings() const { return warnings; }
 
        const Toolchain &get_toolchain() const { return toolchain; }
        VirtualFileSystem &get_vfs() { return vfs; }
@@ -129,12 +126,12 @@ public:
        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();
+       /** 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 actions when slots become
+       /** Supervises the build process, starting new tasks when slots become
        available. */
        int do_build();