X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=55af18a5a2e9b4db855bcefdb67cf84cb9386d89;hb=64f01c486e48f260a5d895092806ee341ef23198;hp=cdf615d768383d9691371c2c2e186f7dabad5b4c;hpb=398983749391592988daca0c9b62b3d38f86e4e6;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index cdf615d..55af18a 100644
--- 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;
@@ -129,12 +128,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();