#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
#include "binarypackage.h"
+#include "booleanevaluator.h"
#include "builder.h"
#include "file.h"
#include "pkgconfigfile.h"
return source_dir/arch.get_name();
}
-bool SourcePackage::match_feature(const string &cond) const
+bool SourcePackage::match_feature(const string &feat, const string *comp) const
{
- string::size_type equals = cond.find('=');
- if(equals!=string::npos)
- {
- if(equals==0)
- throw invalid_argument("SourcePackage::match_feature");
- bool negate = cond[equals-1]=='!';
- string feat = cond.substr(0, equals-negate);
- string value = config.get_option("with_"+feat).value;
- return (value==cond.substr(equals+1))!=negate;
- }
+ string value = config.get_option("with_"+feat).value;
+ if(comp)
+ return value==*comp;
else
- {
- bool negate = (cond[0]=='!');
- string feat = cond.substr(negate);
- string value = config.get_option("with_"+feat).value;
- return lexical_cast<bool>(value)!=negate;
- }
+ return lexical_cast<bool>(value);
}
void SourcePackage::set_build_type(const BuildType &t)
void SourcePackage::Loader::if_feature(const string &cond)
{
- bool match = obj.match_feature(cond);
+ BooleanEvaluator eval(sigc::mem_fun(&obj, &SourcePackage::match_feature));
+ bool match = eval.evaluate(cond);
obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
if(match)
load_sub_with(*this);