Move the bpk files into a subdirectory and install them

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 7ec986e1c2c2d4395d76c8e20d78a2d91235538d..19ee511a814cf34bf46efd20f9409c7394b5d879 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,8 +1,8 @@
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "booleanevaluator.h"
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
@@ -22,11 +22,10 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
                (*i)->prepare();
 
-       create_build_info();
-       create_targets();
+       do_prepare();
        prepared = true;
 }
 
@@ -34,12 +33,24 @@ void Package::prepare()
 Package::Loader::Loader(Package &p):
        DataFile::ObjectLoader<Package>(p)
 {
+       add("if_arch", &Loader::if_arch);
        add("require", &Loader::require);
 }
 
+void Package::Loader::if_arch(const string &cond)
+{
+       BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.builder.get_current_arch(), &Architecture::match_name)), false);
+       bool match = eval.evaluate(cond);
+       obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
+       if(match)
+               load_sub_with(*this);
+}
+
 void Package::Loader::require(const string &n)
 {
        Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
                obj.requires.push_back(req);
+       else
+               obj.problems.push_back(format("Required package %s not found", n));
 }