X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9e1b68dd43d60b4b81d61f2c65051412d7286fa6;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=274230076599f9a78e890514126dbdedc9e5a3ce;hpb=276a7c7c046a8f1b692cecbd53f17595ed23264d;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 2742300..9e1b68d 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,9 +5,9 @@
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "androidapplicationcomponent.h"
 #include "binarycomponent.h"
 #include "binarypackage.h"
-#include "booleanevaluator.h"
 #include "builder.h"
 #include "datapackcomponent.h"
 #include "file.h"
@@ -144,13 +144,15 @@ void SourcePackage::save_caches()
 
 
 SourcePackage::Loader::Loader(SourcePackage &p):
-	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
+	FeatureConditional(p, p.name)
 {
 	init(0);
 }
 
 SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
-	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
+	FeatureConditional(p, p.name)
 {
 	init(&o);
 }
@@ -158,12 +160,12 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
 	options = o;
+	add("android_application", &Loader::component<AndroidApplicationComponent>);
 	add("build_info",  &Loader::build_info);
 	add("datapack",    &Loader::component<DataPackComponent>);
 	add("description", &SourcePackage::description);
 	add("feature",     &Loader::feature);
 	add("generate",    &Loader::generate);
-	add("if_feature",  &Loader::if_feature);
 	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
 	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
@@ -228,15 +230,6 @@ void SourcePackage::Loader::generate(const string &tag)
 	obj.local_tools.add_tool(gen);
 }
 
-void SourcePackage::Loader::if_feature(const string &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);
-}
-
 void SourcePackage::Loader::interface_version(const string &v)
 {
 	obj.interface_version = v;