#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>
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)
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
{
- PackageMap::const_iterator i = packages.find(name);
+ auto i = packages.find(name);
if(i!=packages.end())
return i->second;
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;
}
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(...)
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
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
{
{
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))
{
}
}
- 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");
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; });