X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=ee07987d0186e86641cf43cf8aa11f801d3ea18f;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=7f186382a3e76cf4b8a490095ec9c91f1e416ba4;hpb=a5ea586a080ef6766a7d68b1c40633c6ae8b8ba4;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 7f18638..ee07987 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -19,6 +19,7 @@ using namespace Msp;
 PackageManager::PackageManager(Builder &b):
 	builder(b),
 	no_externals(false),
+	main_pkg(0),
 	env_set(false)
 { }
 
@@ -54,24 +55,43 @@ void PackageManager::add_package(Package *pkg)
 			throw logic_error("Package is already managed");
 	}
 
+	if(packages.empty())
+		main_pkg = pkg;
+
 	packages.insert(PackageMap::value_type(pkg->get_name(), pkg));
 }
 
-Package *PackageManager::find_package(const string &name)
+Package *PackageManager::get_package(const string &name) const
 {
-	PackageMap::iterator i = packages.find(format("%s/%s", name, builder.get_current_arch().get_system()));
-	if(i==packages.end())
-		i = packages.find(name);
+	PackageMap::const_iterator i = packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
+	return 0;
+}
+
+Package &PackageManager::get_main_package() const
+{
+	if(!main_pkg)
+		throw logic_error("No packages");
+	return *main_pkg;
+}
+
+Package *PackageManager::find_package(const string &name)
+{
+	if(not_found.count(name))
+		return 0;
+
+	if(Package *pkg = get_package(name))
+		return pkg;
+
 	if(!no_externals)
 	{
 		FS::Path path = get_package_location(name);
 		if(!path.empty())
 		{
 			builder.load_build_file(path/"Build");
-			i = packages.find(name);
+			PackageMap::iterator i = packages.find(name);
 			if(i!=packages.end())
 				return i->second;
 		}
@@ -81,27 +101,24 @@ Package *PackageManager::find_package(const string &name)
 	if(!path.empty())
 	{
 		builder.load_build_file(path);
-		i = packages.find(name);
-		if(i!=packages.end())
-			return i->second;
+		if(Package *pkg = get_package(name))
+			return pkg;
 	}
 
-	Package *pkg = 0;
 	try
 	{
 		// Package source not found - create a binary package
 		string flags_str = run_pkgconfig(name, "flags");
 		vector<string> flags = split(flags_str);
-		pkg = BinaryPackage::from_flags(builder, name, flags);
+		Package *pkg = BinaryPackage::from_flags(builder, name, flags);
+		packages.insert(PackageMap::value_type(name, pkg));
+		return pkg;
 	}
 	catch(...)
 	{
-		builder.problem(name, "not found");
+		not_found.insert(name);
+		return 0;
 	}
-
-	packages.insert(PackageMap::value_type(name, pkg));
-
-	return pkg;
 }
 
 string PackageManager::run_pkgconfig(const string &pkg, const string &what)
@@ -163,7 +180,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 
 	if(pkg_dirs.empty())
 	{
-		for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+		for(SearchPath::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
 		{
 			builder.get_logger().log("files", format("Traversing %s", *i));
 			list<string> files = list_files(*i);
@@ -185,9 +202,9 @@ FS::Path PackageManager::get_package_location(const string &name)
 	}
 
 	bool msp = !name.compare(0, 3, "msp");
-	for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+	for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
 	{
-		string base = basename(*i);
+		string base = FS::basename(*i);
 		unsigned dash = base.rfind('-');
 
 		if(!base.compare(0, dash, name))
@@ -226,3 +243,9 @@ FS::Path PackageManager::get_binary_package_file(const string &name)
 
 	return FS::Path();
 }
+
+void PackageManager::save_all_caches() const
+{
+	for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+		i->second->save_caches();
+}