X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.h;h=b168d723e174739c3c652f376f7f1cefe407cda2;hb=6382743d26f8d5bb10a53cb907659bee6614b549;hp=9ae93c9829b9ade57911e1f514a0c9c2fe25893b;hpb=a261f895c42dedb1a1fa1f03934ad9895d3f648c;p=builder.git

diff --git a/source/packagemanager.h b/source/packagemanager.h
index 9ae93c9..b168d72 100644
--- a/source/packagemanager.h
+++ b/source/packagemanager.h
@@ -24,8 +24,12 @@ private:
 	Builder &builder;
 	SearchPath pkg_path;
 	SearchPath pkg_dirs;
+	SearchPath binpkg_path;
+	SearchPath binpkg_files;
 	bool no_externals;
 	PackageMap packages;
+	Package *main_pkg;
+	std::set<std::string> not_found;
 	bool env_set;
 
 public:
@@ -35,6 +39,9 @@ public:
 	/// Adds a location to look for source packages from.
 	void append_package_path(const Msp::FS::Path &);
 
+	/// Adds a location to look for binary packages from.
+	void append_binary_package_path(const Msp::FS::Path &);
+
 	/** Prevent creation of source packages. */
 	void set_no_externals(bool);
 
@@ -42,19 +49,31 @@ public:
 	void add_package(Package *);
 
 	/** Returns a package from the cache. */
-	Package *get_package(const std::string &);
+	Package *get_package(const std::string &) const;
+
+	/** Returns the package that was added first.  This should be considered
+	the primary build target. */
+	Package &get_main_package() const;
 
 	const PackageMap &get_packages() const { return packages; }
 
-	/** Locates a package and creates it if necessary. */
+	/** Locates a package and loads it if necessary. */
 	Package *find_package(const std::string &);
 
 private:
 	std::string run_pkgconfig(const std::string &, const std::string &);
 
 	/** Determines the source directory of a package.  Pkg-config is consulted
-	first, and if it fails, the package path is searched for matches. */
+	first, and if it fails, the package path is searched for matches.  The
+	package is expected to be located in a directory named after itself. */
 	Msp::FS::Path get_package_location(const std::string &);
+
+	/** Determines the file containing a binary package.  The file is expected
+	to be named after the package. */
+	Msp::FS::Path get_binary_package_file(const std::string &);
+
+public:
+	void save_all_caches() const;
 };
 
 #endif