argv.push_back("--variable="+what);
argv.push_back(pkg);
- if(builder.get_verbose()>=4)
- IO::print("Running %s\n", join(argv.begin(), argv.end()));
-
- ExternalTask task(argv);
- task.set_stdout(ExternalTask::CAPTURE);
- task.set_stderr(ExternalTask::IGNORE);
- task.start();
- Task::Status status;
- while((status=task.check())==Task::RUNNING)
- Time::sleep(10*Time::msec);
- if(status==Task::ERROR)
- throw runtime_error(format("pkg-config for package %s failed", pkg));
-
- return task.get_output();
+ builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+
+ return ExternalTask::run_and_capture_output(argv);
}
FS::Path PackageManager::get_package_location(const string &name)
{
- if(builder.get_verbose()>=3)
- IO::print("Looking for package %s\n", name);
+ builder.get_logger().log("packagemgr", format("Looking for package %s", name));
try
{
{
for(list<FS::Path>::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);
for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
{
pkg_dirs.push_back(full);
}
}
- if(builder.get_verbose()>=3)
- IO::print("%d packages found in path\n", pkg_dirs.size());
+ builder.get_logger().log("packagemgr", format("%d packages found in path", pkg_dirs.size()));
}
bool msp = !name.compare(0, 3, "msp");