X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=0dc16d175d5c75cfbd60a3f60db1a96f50af2dc0;hb=8b9f2196ec0a930992614f174b7970c2ed523699;hp=7a33ab8f86d6022a142e99eaad17d9f3da8e59ff;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 7a33ab8..0dc16d1 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -10,6 +10,7 @@
 #include "architecture.h"
 #include "config.h"
 #include "misc.h"
+#include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
 #include "toolchain.h"
@@ -59,22 +60,16 @@ public:
 	typedef std::list<Target *> TargetList;
 
 private:
-	typedef std::list<Package *> PackageList;
-	typedef std::map<std::string, Package *> PackageMap;
 	typedef std::map<std::string, StringMap> ProfileTemplateMap;
 
 	StringList cmdline_targets;
 	StringMap cmdline_options;
 	Msp::FS::Path cwd;
 
-	PackageMap packages;
+	PackageManager package_manager;
 	SourcePackage *main_pkg;
-	PathList pkg_path;
-	PathList pkg_dirs;
-	bool no_externals;
 
 	TargetMap targets;
-	TargetList new_tgts;
 
 	Architecture native_arch;
 	Architecture *current_arch;
@@ -111,16 +106,10 @@ public:
 	int main();
 	unsigned get_verbose() const { return verbose; }
 	bool get_dry_run() const { return dry_run; }
-	bool get_build_all() const { return build_all; }
-
-	/** Gets a package by name, possibly creating it.  Returns 0 if the package
-	could not be located. */
-	Package *get_package(const std::string &);
 
+	PackageManager &get_package_manager() { return package_manager; }
 	SourcePackage *get_main_package() const { return main_pkg; }
 
-	std::string run_pkgconfig(const std::string &, const std::string &);
-
 	/** Looks up a target by name.  Returns 0 if no such target exists. */
 	Target *get_target(const std::string &) const;
 
@@ -145,15 +134,11 @@ public:
 
 	static void usage(const char *, const char *, bool);
 
-private:
-	/** Determines the source directory of a package.  Pkg-config is consulted
-	first, and if it fails, the package path is searched for matches. */
-	Msp::FS::Path get_package_location(const std::string &);
-
 	/** Loads a build file.  Returns 0 on success or -1 if the file could not be
 	opened. */
 	int load_build_file(const Msp::FS::Path &);
 
+private:
 	/** Creates targets for all packages and prepares them for building.
 	Returns 0 if everything went ok, -1 if something bad happened and a build
 	shouldn't be attempted. */