X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=d13aa737b985a71a8a99242445bb5915472c66d3;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=e98f4e786f88b9d2fd4e674f1dcf76249e4965ee;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/package.h b/source/package.h
index e98f4e7..d13aa73 100644
--- a/source/package.h
+++ b/source/package.h
@@ -1,17 +1,16 @@
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
-#include <list>
 #include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "config.h"
 
 class Builder;
 class Package;
 
-typedef std::list<Package *> PackageList;
-
 /**
 A package is a distributable piece of software.  Package information may be
 obtained in several ways: Build files of source packages, pkg-config for binary
@@ -20,7 +19,7 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-	class Loader: public Msp::DataFile::ObjectLoader<Package>
+	class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
 	{
 	public:
 		Loader(Package &);
@@ -28,41 +27,47 @@ public:
 		void require(const std::string &);
 	};
 
+	using Requirements = std::vector<Package *>;
+
 protected:
 	Builder &builder;
 
 	std::string name;
+	std::string label;
 
-	PackageList requires;
+	Requirements requires;
 	BuildInfo export_binfo;
-	bool prepared;
+	bool prepared = false;
+	std::vector<std::string> problems;
 
-	bool use_pkgconfig;
+	bool use_pkgconfig = true;
 
 	Package(Builder &, const std::string &);
 public:
 	virtual ~Package() { }
 
-	const std::string &get_name() const { return name; }
 	Builder &get_builder() const { return builder; }
-	const PackageList &get_requires() const { return requires; }
+	const std::string &get_name() const { return name; }
+	const std::string &get_label() const { return label; }
+	const Requirements &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; }
+	bool uses_pkgconfig() const { return use_pkgconfig; }
 
 	/** Prepares the package for building.  Recursively prepares all required
 	packages, populates build info and creates targets. */
 	void prepare();
 
-	bool is_prepared() const { return prepared; }
 protected:
-	virtual void create_build_info() { }
-
-	virtual void create_targets() { }
+	virtual void do_prepare() { }
 
 public:
+	bool is_prepared() const { return prepared; }
+
+	const std::vector<std::string> &get_problems() const { return problems; }
+
 	virtual void save_caches() { }
 };