X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarypackage.h;h=62a8acf3fc6ba70bc2a2d2c215c7359cf8b8a5d9;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=892718484856cfc98a3bf5102a050fd835ab7b74;hpb=a0868300fc26496b5a7551d1b732925c11350fdd;p=builder.git

diff --git a/source/binarypackage.h b/source/binarypackage.h
index 8927184..62a8acf 100644
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -10,7 +10,7 @@ Builder.
 class BinaryPackage: public Package
 {
 public:
-	class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>
 	{
 	public:
 		Loader(BinaryPackage &);
@@ -19,18 +19,22 @@ public:
 		void header(const std::string &);
 	};
 
-private:
-	typedef std::list<std::string> HeaderList;
+	using Flags = std::vector<std::string>;
 
+private:
 	Msp::FS::Path base_path;
-	HeaderList headers;
+	std::vector<std::string> headers;
+	BuildInfo static_binfo;
 
 public:
 	BinaryPackage(Builder &, const std::string &);
 
-	static BinaryPackage *from_flags(Builder &, const std::string &, const std::vector<std::string> &);
+	const BuildInfo &get_static_build_info() const { return static_binfo; }
+
+	static BinaryPackage *from_flags(Builder &, const std::string &, const Flags &, const Flags & = Flags());
 private:
-	virtual void do_prepare();
+	static void process_flags(const Flags &, BuildInfo &);
+	void do_prepare() override;
 };
 
 #endif