X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=240bf60caafd888ad9b56845331235c8849dce62;hb=0dd3d23846e7fdb729359a57d3f4b190f65aed55;hp=fc198814591f3f90a70af0dedbd4636ec859b142;hpb=1e406373b33a5eb3e881fdd95e9ce33881fae2cd;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index fc19881..240bf60 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -33,6 +33,11 @@ void PackageManager::append_package_path(const FS::Path &p)
 	pkg_path.push_back(p);
 }
 
+void PackageManager::append_binary_package_path(const FS::Path &p)
+{
+	binpkg_path.push_back(p);
+}
+
 void PackageManager::set_no_externals(bool x)
 {
 	no_externals = x;
@@ -54,9 +59,10 @@ void PackageManager::add_package(Package *pkg)
 
 Package *PackageManager::find_package(const string &name)
 {
-	PackageMap::iterator i = packages.find(format("%s/%s", name, builder.get_current_arch().get_system()));
-	if(i==packages.end())
-		i = packages.find(name);
+	if(not_found.count(name))
+		return 0;
+
+	PackageMap::iterator i = packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
@@ -72,22 +78,30 @@ Package *PackageManager::find_package(const string &name)
 		}
 	}
 
-	Package *pkg = 0;
+	FS::Path path = get_binary_package_file(name);
+	if(!path.empty())
+	{
+		builder.load_build_file(path);
+		i = packages.find(name);
+		if(i!=packages.end())
+			return i->second;
+	}
+
 	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)
@@ -135,7 +149,7 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 
 FS::Path PackageManager::get_package_location(const string &name)
 {
-	builder.get_logger().log("packagemgr", format("Looking for package %s", name));
+	builder.get_logger().log("packagemgr", format("Looking for source package %s", name));
 
 	try
 	{
@@ -149,24 +163,31 @@ 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);
+			unsigned count = 0;
 			for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
 			{
 				FS::Path full = *i / *j;
 				if(FS::exists(full/"Build"))
+				{
 					pkg_dirs.push_back(full);
+					++count;
+				}
 			}
+
+			builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, *i));
 		}
-		builder.get_logger().log("packagemgr", format("%d packages found in path", pkg_dirs.size()));
+
+		builder.get_logger().log("packagemgr", format("%d source packages found", pkg_dirs.size()));
 	}
 
 	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))
@@ -177,3 +198,31 @@ FS::Path PackageManager::get_package_location(const string &name)
 
 	return FS::Path();
 }
+
+FS::Path PackageManager::get_binary_package_file(const string &name)
+{
+	builder.get_logger().log("packagemgr", format("Looking for binary package %s", name));
+
+	if(binpkg_files.empty())
+	{
+		for(list<FS::Path>::const_iterator i=binpkg_path.begin(); i!=binpkg_path.end(); ++i)
+		{
+			builder.get_logger().log("files", format("Traversing %s", *i));
+			list<string> files = list_filtered(*i, "\\.bpk$");
+			for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
+				binpkg_files.push_back(*i / *j);
+			builder.get_logger().log("packagemgr", format("%d binary packages found in %s", files.size(), *i));
+		}
+
+		builder.get_logger().log("packagemgr", format("%d binary packages found", binpkg_files.size()));
+	}
+
+	for(SearchPath::const_iterator i=binpkg_files.begin(); i!=binpkg_files.end(); ++i)
+	{
+		string base = FS::basepart(FS::basename(*i));
+		if(base==name)
+			return *i;
+	}
+
+	return FS::Path();
+}