Load binary packages from separate files

[builder.git] / source / packagemanager.cpp

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 55498467d636a694f957e58a3dd475fd3b185b87..7f186382a3e76cf4b8a490095ec9c91f1e416ba4 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -33,6 +33,11 @@ void PackageManager::append_package_path(const FS::Path &p)
        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;
@@ -72,6 +77,15 @@ Package *PackageManager::find_package(const string &name)
                }
        }
 
+       FS::Path path = get_binary_package_file(name);
+       if(!path.empty())
+       {
+               builder.load_build_file(path);
+               i = packages.find(name);
+               if(i!=packages.end())
+                       return i->second;
+       }
+
        Package *pkg = 0;
        try
        {
@@ -184,3 +198,31 @@ FS::Path PackageManager::get_package_location(const string &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();
+}