Add a field for a human-readable name for packages

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index aa9160e11b8e62ab03c16a0e961dc579bbe0894f..5f25f1a90eb053705092d75b13f565109ffbf2a4 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,6 +1,7 @@
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "booleanevaluator.h"
 #include "builder.h"
 #include "package.h"
 
@@ -10,6 +11,7 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
+       label(string(1, toupper(n[0]))+n.substr(1)),
        prepared(false),
        use_pkgconfig(true)
 {
@@ -33,12 +35,14 @@ Package::Loader::Loader(Package &p):
        DataFile::ObjectLoader<Package>(p)
 {
        add("if_arch", &Loader::if_arch);
+       add("label",   &Package::label);
        add("require", &Loader::require);
 }
 
 void Package::Loader::if_arch(const string &cond)
 {
-       bool match = obj.builder.get_current_arch().match_name(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);