X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=54cd550d062b9fc4014bf706e854e98e31d8b72f;hb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;hp=35c752e8e4e056d979e1b55d536f94e66219ea04;hpb=4ee988cdd18d919b11355c21e5234c3f28f5d6a7;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 35c752e..54cd550 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -1,4 +1,5 @@
 #include <cstdlib>
+#include <msp/core/algorithm.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -25,8 +26,8 @@ PackageManager::PackageManager(Builder &b):
 
 PackageManager::~PackageManager()
 {
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-		delete i->second;
+	for(const auto &kvp: packages)
+		delete kvp.second;
 }
 
 void PackageManager::append_package_path(const FS::Path &p)
@@ -46,7 +47,7 @@ void PackageManager::set_no_externals(bool x)
 
 void PackageManager::add_package(Package *pkg)
 {
-	PackageMap::iterator i = packages.find(pkg->get_name());
+	auto i = packages.find(pkg->get_name());
 	if(i!=packages.end())
 	{
 		if(i->second!=pkg)
@@ -63,7 +64,7 @@ void PackageManager::add_package(Package *pkg)
 
 Package *PackageManager::get_package(const string &name) const
 {
-	PackageMap::const_iterator i = packages.find(name);
+	auto i = packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
@@ -91,7 +92,7 @@ Package *PackageManager::find_package(const string &name)
 		if(!path.empty())
 		{
 			builder.load_build_file(path/"Build");
-			PackageMap::iterator i = packages.find(name);
+			auto i = packages.find(name);
 			if(i!=packages.end())
 				return i->second;
 		}
@@ -135,10 +136,7 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 			if(const char *pcp = getenv("PKG_CONFIG_PATH"))
 			{
 				vector<string> path = split(pcp, ':');
-				bool found = false;
-				for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
-					found = (*i==pcdir.str());
-				if(!found)
+				if(!any_equals(path, pcdir.str()))
 				{
 					path.push_back(pcdir.str());
 					setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
@@ -190,14 +188,13 @@ FS::Path PackageManager::get_package_location(const string &name)
 
 	if(pkg_dirs.empty())
 	{
-		for(SearchPath::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+		for(const FS::Path &p: pkg_path)
 		{
-			builder.get_logger().log("files", format("Traversing %s", *i));
-			vector<string> files = list_files(*i);
+			builder.get_logger().log("files", format("Traversing %s", p));
 			unsigned count = 0;
-			for(vector<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
+			for(const string &f: list_files(p))
 			{
-				FS::Path full = *i / *j;
+				FS::Path full = p/f;
 				if(FS::exists(full/"Build"))
 				{
 					pkg_dirs.push_back(full);
@@ -205,22 +202,22 @@ FS::Path PackageManager::get_package_location(const string &name)
 				}
 			}
 
-			builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, *i));
+			builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, p));
 		}
 
 		builder.get_logger().log("packagemgr", format("%d source packages found", pkg_dirs.size()));
 	}
 
 	bool msp = !name.compare(0, 3, "msp");
-	for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+	for(const FS::Path &p: pkg_dirs)
 	{
-		string base = FS::basename(*i);
+		string base = FS::basename(p);
 		unsigned dash = base.rfind('-');
 
 		if(!base.compare(0, dash, name))
-			return *i;
+			return p;
 		else if(msp && !base.compare(0, dash, name, 3, string::npos))
-			return *i;
+			return p;
 	}
 
 	return FS::Path();
@@ -232,30 +229,27 @@ FS::Path PackageManager::get_binary_package_file(const string &name)
 
 	if(binpkg_files.empty())
 	{
-		for(list<FS::Path>::const_iterator i=binpkg_path.begin(); i!=binpkg_path.end(); ++i)
+		for(const FS::Path &p: binpkg_path)
 		{
-			builder.get_logger().log("files", format("Traversing %s", *i));
-			vector<string> files = list_filtered(*i, "\\.bpk$");
-			for(vector<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("files", format("Traversing %s", p));
+			vector<string> files = list_filtered(p, "\\.bpk$");
+			for(const string &f: files)
+				binpkg_files.push_back(p/f);
+			builder.get_logger().log("packagemgr", format("%d binary packages found in %s", files.size(), p));
 		}
 
 		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;
-	}
+	auto i = find_if(binpkg_files, [&name](const FS::Path &p){ return FS::basepart(FS::basename(p))==name; });
+	if(i!=binpkg_files.end())
+		return *i;
 
 	return FS::Path();
 }
 
 void PackageManager::save_all_caches() const
 {
-	for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-		i->second->save_caches();
+	for(const auto &kvp: packages)
+		kvp.second->save_caches();
 }