X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarypackage.h;h=b47d468fe138ccf761c64d88b1f3169c2b3a51f6;hb=06678c3bb61404c483e4b9c39eaa7e7fb3f40c62;hp=b10331b27cec63731c076ad4a0db06e6611b9001;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/binarypackage.h b/source/binarypackage.h
index b10331b..b47d468 100644
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BINARYPACKAGE_H_
 #define BINARYPACKAGE_H_
 
@@ -17,24 +10,31 @@ Builder.
 class BinaryPackage: public Package
 {
 public:
-	class Loader: public Package::Loader
+	class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package>
 	{
 	public:
 		Loader(BinaryPackage &);
-		BinaryPackage &get_object() { return static_cast<BinaryPackage &>(pkg); }
 	private:
 		void build_info();
 	};
 
+private:
+	bool need_path;
+	Msp::FS::Path path;
+
+public:
 	BinaryPackage(Builder &, const std::string &);
-	void set_path(const Msp::Path::Path &);
+
+	/**
+	Sets the path where the package's files were installed.  This is only useful
+	if the package doesn't use pkg-config.
+	*/
+	void set_path(const Msp::FS::Path &);
+
 	bool get_need_path() const { return need_path; }
 
-	static BinaryPackage *from_pkgconfig(Builder &, const std::string &);
+	static BinaryPackage *from_flags(Builder &, const std::string &, const std::vector<std::string> &);
 private:
-	bool need_path;
-	Msp::Path::Path path;
-
 	virtual void create_build_info();
 };