PackageManager::PackageManager(Builder &b):
builder(b),
no_externals(false),
+ main_pkg(0),
env_set(false)
{ }
pkg_path.push_back(p);
}
+void PackageManager::append_binary_package_path(const FS::Path &p)
+{
+ binpkg_path.push_back(p);
+}
+
void PackageManager::set_no_externals(bool x)
{
no_externals = x;
throw logic_error("Package is already managed");
}
+ if(packages.empty())
+ main_pkg = pkg;
+
packages.insert(PackageMap::value_type(pkg->get_name(), pkg));
}
-Package *PackageManager::find_package(const string &name)
+Package *PackageManager::get_package(const string &name) const
{
- PackageMap::iterator i = packages.find(format("%s/%s", name, builder.get_current_arch().get_system()));
- if(i==packages.end())
- i = packages.find(name);
+ PackageMap::const_iterator i = packages.find(name);
if(i!=packages.end())
return i->second;
+ return 0;
+}
+
+Package &PackageManager::get_main_package() const
+{
+ if(!main_pkg)
+ throw logic_error("No packages");
+ return *main_pkg;
+}
+
+Package *PackageManager::find_package(const string &name)
+{
+ if(not_found.count(name))
+ return 0;
+
+ if(Package *pkg = get_package(name))
+ return pkg;
+
if(!no_externals)
{
FS::Path path = get_package_location(name);
if(!path.empty())
{
builder.load_build_file(path/"Build");
- i = packages.find(name);
+ PackageMap::iterator i = packages.find(name);
if(i!=packages.end())
return i->second;
}
}
- Package *pkg = 0;
+ FS::Path path = get_binary_package_file(name);
+ if(!path.empty())
+ {
+ builder.load_build_file(path);
+ if(Package *pkg = get_package(name))
+ return pkg;
+ }
+
try
{
// Package source not found - create a binary package
string flags_str = run_pkgconfig(name, "flags");
- vector<string> flags = split(flags_str);
- pkg = BinaryPackage::from_flags(builder, name, flags);
+ BinaryPackage::Flags flags = split(flags_str);
+ 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));
+ return pkg;
}
catch(...)
{
- builder.problem(name, "not found");
+ not_found.insert(name);
+ return 0;
}
-
- packages.insert(PackageMap::value_type(name, pkg));
-
- return pkg;
}
string PackageManager::run_pkgconfig(const string &pkg, const string &what)
argv.push_back("pkg-config");
if(what=="cflags" || what=="libs")
argv.push_back("--"+what);
- else if(what=="flags")
+ else if(what=="flags" || what=="staticflags")
{
argv.push_back("--cflags");
argv.push_back("--libs");
+ if(what=="staticflags")
+ argv.push_back("--static");
}
else
argv.push_back("--variable="+what);
FS::Path PackageManager::get_package_location(const string &name)
{
- builder.get_logger().log("packagemgr", format("Looking for package %s", name));
+ builder.get_logger().log("packagemgr", format("Looking for source package %s", name));
try
{
// Try to get source directory with pkgconfig
string srcdir = strip(run_pkgconfig(name, "source"));
- if(!srcdir.empty())
+ if(!srcdir.empty() && FS::exists(FS::Path(srcdir)/"Build"))
return srcdir;
}
catch(...)
if(pkg_dirs.empty())
{
- for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+ for(SearchPath::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);
+ unsigned count = 0;
for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
{
FS::Path full = *i / *j;
if(FS::exists(full/"Build"))
+ {
pkg_dirs.push_back(full);
+ ++count;
+ }
}
+
+ builder.get_logger().log("packagemgr", format("%d source packages found in %s", count, *i));
}
- builder.get_logger().log("packagemgr", format("%d packages found in path", pkg_dirs.size()));
+
+ builder.get_logger().log("packagemgr", format("%d source packages found", pkg_dirs.size()));
}
bool msp = !name.compare(0, 3, "msp");
- for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+ for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
{
- string base = basename(*i);
+ string base = FS::basename(*i);
unsigned dash = base.rfind('-');
if(!base.compare(0, dash, name))
return FS::Path();
}
+
+FS::Path PackageManager::get_binary_package_file(const string &name)
+{
+ builder.get_logger().log("packagemgr", format("Looking for binary package %s", name));
+
+ if(binpkg_files.empty())
+ {
+ for(list<FS::Path>::const_iterator i=binpkg_path.begin(); i!=binpkg_path.end(); ++i)
+ {
+ builder.get_logger().log("files", format("Traversing %s", *i));
+ list<string> files = list_filtered(*i, "\\.bpk$");
+ for(list<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("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;
+ }
+
+ return FS::Path();
+}
+
+void PackageManager::save_all_caches() const
+{
+ for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ i->second->save_caches();
+}