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

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 54cd550..9e53bb4 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -4,7 +4,6 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
-#include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
@@ -18,10 +17,7 @@ using namespace std;
 using namespace Msp;
 
 PackageManager::PackageManager(Builder &b):
-	builder(b),
-	no_externals(false),
-	main_pkg(0),
-	env_set(false)
+	builder(b)
 { }
 
 PackageManager::~PackageManager()
@@ -59,7 +55,7 @@ void PackageManager::add_package(Package *pkg)
 	if(packages.empty())
 		main_pkg = pkg;
 
-	packages.insert(PackageMap::value_type(pkg->get_name(), pkg));
+	packages.insert({ pkg->get_name(), pkg });
 }
 
 Package *PackageManager::get_package(const string &name) const
@@ -114,7 +110,7 @@ Package *PackageManager::find_package(const string &name)
 		flags_str = run_pkgconfig(name, "staticflags");
 		BinaryPackage::Flags static_flags = split(flags_str);
 		Package *pkg = BinaryPackage::from_flags(builder, name, flags, static_flags);
-		packages.insert(PackageMap::value_type(name, pkg));
+		packages.insert({ name, pkg });
 		return pkg;
 	}
 	catch(...)
@@ -162,7 +158,7 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 		argv.push_back("--variable="+what);
 	argv.push_back(pkg);
 
-	builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+	builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
 
 	return ExternalTask::run_and_capture_output(argv);
 #else
@@ -174,7 +170,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 source package %s", name));
+	builder.get_logger().log("packagemgr", "Looking for source package %s", name);
 
 	try
 	{
@@ -190,7 +186,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 	{
 		for(const FS::Path &p: pkg_path)
 		{
-			builder.get_logger().log("files", format("Traversing %s", p));
+			builder.get_logger().log("files", "Traversing %s", p);
 			unsigned count = 0;
 			for(const string &f: list_files(p))
 			{
@@ -202,10 +198,10 @@ FS::Path PackageManager::get_package_location(const string &name)
 				}
 			}
 
-			builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, p));
+			builder.get_logger().log("packagemgr", "%d source packages found in %s", count, p);
 		}
 
-		builder.get_logger().log("packagemgr", format("%d source packages found", pkg_dirs.size()));
+		builder.get_logger().log("packagemgr", "%d source packages found", pkg_dirs.size());
 	}
 
 	bool msp = !name.compare(0, 3, "msp");
@@ -225,20 +221,20 @@ FS::Path PackageManager::get_package_location(const string &name)
 
 FS::Path PackageManager::get_binary_package_file(const string &name)
 {
-	builder.get_logger().log("packagemgr", format("Looking for binary package %s", name));
+	builder.get_logger().log("packagemgr", "Looking for binary package %s", name);
 
 	if(binpkg_files.empty())
 	{
 		for(const FS::Path &p: binpkg_path)
 		{
-			builder.get_logger().log("files", format("Traversing %s", p));
+			builder.get_logger().log("files", "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", "%d binary packages found in %s", files.size(), p);
 		}
 
-		builder.get_logger().log("packagemgr", format("%d binary packages found", binpkg_files.size()));
+		builder.get_logger().log("packagemgr", "%d binary packages found", binpkg_files.size());
 	}
 
 	auto i = find_if(binpkg_files, [&name](const FS::Path &p){ return FS::basepart(FS::basename(p))==name; });