X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpackage.h;h=8811390601c39ef2aa05b1ed201c7588ec667c34;hb=e943994f881a060b184aeee869a32a464f504a62;hp=14b343d9687227599a865130fa6fbe28dbe596cf;hpb=d701ca81b781cd061fd60244312b0316cf5bf4d9;p=builder.git

diff --git a/source/package.h b/source/package.h
index 14b343d..8811390 100644
--- a/source/package.h
+++ b/source/package.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "config.h"
 
 class Builder;
 class Package;
@@ -24,6 +25,7 @@ public:
 	public:
 		Loader(Package &);
 	private:
+		void if_arch(const std::string &);
 		void require(const std::string &);
 	};
 
@@ -34,7 +36,7 @@ protected:
 
 	PackageList requires;
 	BuildInfo export_binfo;
-	bool conf_done;
+	bool prepared;
 
 	bool use_pkgconfig;
 
@@ -44,24 +46,22 @@ public:
 
 	const std::string &get_name() const { return name; }
 	Builder &get_builder() const { return builder; }
-	const PackageList &get_requires() const { return requires; }
+	const PackageList &get_required_packages() const { return requires; }
 
-	const BuildInfo &get_exported_binfo() const { return export_binfo; }
+	const BuildInfo &get_exported_build_info() const { return export_binfo; }
 
 	/// Indicates whether or not this package supports pkg-config
 	bool get_use_pkgconfig() const { return use_pkgconfig; }
 
-	/** Processes configuration options that were most likely obtained from the
-	command line. */
-	void configure(const StringMap &, unsigned);
+	/** Prepares the package for building.  Recursively prepares all required
+	packages, populates build info and creates targets. */
+	void prepare();
 
-	bool is_configured() const { return conf_done; }
 protected:
-	virtual void do_configure(const StringMap &, unsigned) { }
-	virtual void create_build_info() { }
+	virtual void do_prepare() { }
 
 public:
-	virtual void create_targets() { }
+	bool is_prepared() const { return prepared; }
 
 	virtual void save_caches() { }
 };