-#include <algorithm>
+#include <msp/core/algorithm.h>
#include <msp/io/print.h>
#include <msp/strings/utils.h>
#include "binarypackage.h"
use_pkgconfig = false;
}
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const Flags &flags, const Flags &static_flags)
+{
+ BinaryPackage *pkg = new BinaryPackage(builder, name);
+ pkg->use_pkgconfig = true;
+
+ process_flags(flags, pkg->export_binfo);
+
+ Flags exclusive_static_flags;
+ for(const string &f: static_flags)
+ if(!any_equals(flags, f))
+ exclusive_static_flags.push_back(f);
+ process_flags(exclusive_static_flags, pkg->static_binfo);
+
+ return pkg;
+}
+
+void BinaryPackage::process_flags(const Flags &flags, BuildInfo &binfo)
+{
+ for(const string &f: flags)
+ {
+ if(!f.compare(0, 2, "-I"))
+ binfo.incpath.push_back(f.substr(2));
+ else if(!f.compare(0, 2, "-D"))
+ {
+ string::size_type equals = f.find('=');
+ if(equals!=string::npos)
+ binfo.defines[f.substr(2, equals-2)] = f.substr(equals+1);
+ else
+ binfo.defines[f.substr(2)] = string();
+ }
+ else if(!f.compare(0, 2, "-L"))
+ binfo.libpath.push_back(f.substr(2));
+ else if(!f.compare(0, 2, "-l"))
+ binfo.libs.push_back(f.substr(2));
+ else if(f=="-pthread")
+ binfo.threads = true;
+ }
+}
+
void BinaryPackage::do_prepare()
{
- bool has_relative_paths = false;
- for(BuildInfo::PathList::const_iterator i=export_binfo.libpath.begin(); (!has_relative_paths && i!=export_binfo.libpath.end()); ++i)
- has_relative_paths = !i->is_absolute();
- for(BuildInfo::PathList::const_iterator i=export_binfo.incpath.begin(); (!has_relative_paths && i!=export_binfo.incpath.end()); ++i)
- has_relative_paths = !i->is_absolute();
+ auto is_relative = [](const FS::Path &p){ return !p.is_absolute(); };
+ bool has_relative_paths = any_of(export_binfo.libpath.begin(), export_binfo.libpath.end(), is_relative) ||
+ any_of(export_binfo.incpath.begin(), export_binfo.incpath.end(), is_relative);
- list<FS::Path> bases;
+ vector<FS::Path> bases;
/* If we have any relative paths that need resolving, or we have no paths at
all and are not using pkg-config, look for files in prefix */
bases.push_back(FS::Path());
bool system = false;
- for(list<FS::Path>::const_iterator i=bases.begin(); i!=bases.end(); ++i)
+ for(const FS::Path &b: bases)
{
- FS::Path prefix = *i;
+ FS::Path prefix = b;
system = prefix.empty();
if(system)
{
prefix /= arch.get_cross_prefix();
}
- BuildInfo::PathList libpath = export_binfo.libpath;
+ VirtualFileSystem::SearchPath libpath = export_binfo.libpath;
if(!system && libpath.empty())
libpath.push_back("lib");
- for(BuildInfo::PathList::iterator j=libpath.begin(); j!=libpath.end(); ++j)
- *j = prefix/ *j;
+ for(FS::Path &p: libpath)
+ p = prefix/p;
bool all_found = true;
- for(BuildInfo::WordList::const_iterator j=export_binfo.libs.begin(); j!=export_binfo.libs.end(); ++j)
- all_found &= (builder.get_vfs().find_library(*j, libpath, export_binfo.libmode, system)!=0);
+ for(const string &l: export_binfo.libs)
+ all_found &= (builder.get_vfs().find_library(l, libpath, export_binfo.libmode, system)!=0);
- BuildInfo::PathList incpath = export_binfo.incpath;
+ VirtualFileSystem::SearchPath incpath = export_binfo.incpath;
if(!system && incpath.empty())
incpath.push_back("include");
- for(BuildInfo::PathList::iterator j=incpath.begin(); j!=incpath.end(); ++j)
- *j = prefix/ *j;
+ for(FS::Path &p: incpath)
+ p = prefix/p;
- for(HeaderList::const_iterator j=headers.begin(); j!=headers.end(); ++j)
- all_found &= (builder.get_vfs().find_header(*j, 0, incpath, system)!=0);
+ for(const string &h: headers)
+ all_found &= (builder.get_vfs().find_header(h, 0, incpath, system)!=0);
if(all_found)
{
base_path = prefix;
- builder.get_logger().log("configure", format("%s found in %s", name, ((system && use_pkgconfig) ? "system" : base_path.str())));
+ builder.get_logger().log("configure", "%s found in %s", name, ((system && use_pkgconfig) ? "system" : base_path.str()));
break;
}
}
if(base_path.empty())
{
// TODO report which files were not found
+ builder.get_logger().log("problems", "Cannot locate files for %s", name);
problems.push_back("Cannot locate files");
return;
}
if(has_relative_paths)
{
- for(BuildInfo::PathList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i)
- *i = base_path/ *i;
- for(BuildInfo::PathList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
- *i = base_path/ *i;
+ for(FS::Path &p: export_binfo.incpath)
+ p = base_path/p;
+ for(FS::Path &p: export_binfo.libpath)
+ p = base_path/p;
}
if(!static_binfo.libs.empty())
{
- BuildInfo::PathList combined_libpath = static_binfo.libpath;
+ VirtualFileSystem::SearchPath combined_libpath = static_binfo.libpath;
combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end());
- for(BuildInfo::WordList::const_iterator i=export_binfo.libs.begin(); i!=export_binfo.libs.end(); ++i)
- if(Target *lib = builder.get_vfs().find_library(*i, export_binfo.libpath, BuildInfo::FORCE_STATIC, system))
+ for(const string &l: export_binfo.libs)
+ if(Target *lib = builder.get_vfs().find_library(l, export_binfo.libpath, BuildInfo::FORCE_STATIC, system))
if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
{
- for(BuildInfo::WordList::const_iterator j=static_binfo.libs.begin(); j!=static_binfo.libs.end(); ++j)
- stlib->add_required_library(*j);
- for(BuildInfo::PathList::const_iterator j=combined_libpath.begin(); j!=combined_libpath.end(); ++j)
- stlib->add_library_path(*j);
+ for(const string &s: static_binfo.libs)
+ stlib->add_required_library(s);
+ for(const FS::Path &p: combined_libpath)
+ stlib->add_library_path(p);
}
}
}
-BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const Flags &flags, const Flags &static_flags)
-{
- BinaryPackage *pkg = new BinaryPackage(builder, name);
- pkg->use_pkgconfig = true;
-
- process_flags(flags, pkg->export_binfo);
-
- Flags exclusive_static_flags;
- for(Flags::const_iterator i=static_flags.begin(); i!=static_flags.end(); ++i)
- if(find(flags.begin(), flags.end(), *i)==flags.end())
- exclusive_static_flags.push_back(*i);
- process_flags(exclusive_static_flags, pkg->static_binfo);
-
- return pkg;
-}
-
-void BinaryPackage::process_flags(const Flags &flags, BuildInfo &binfo)
-{
- for(Flags::const_iterator i=flags.begin(); i!=flags.end(); ++i)
- {
- if(!i->compare(0, 2, "-I"))
- binfo.incpath.push_back(i->substr(2));
- else if(!i->compare(0, 2, "-D"))
- {
- string::size_type equals = i->find('=');
- if(equals!=string::npos)
- binfo.defines[i->substr(2, equals-2)] = i->substr(equals+1);
- else
- binfo.defines[i->substr(2)] = string();
- }
- else if(!i->compare(0, 2, "-L"))
- binfo.libpath.push_back(i->substr(2));
- else if(!i->compare(0, 2, "-l"))
- binfo.libs.push_back(i->substr(2));
- else if(*i=="-pthread")
- binfo.threads = true;
- }
-}
-
BinaryPackage::Loader::Loader(BinaryPackage &p):
DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>(p)
projects / builder.git / blobdiff