X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=bb9999476d0041f3529aacc44b7a3a60b3d8b960;hb=e4c839cacd8572ade951f4961e8e145d20e0103f;hp=942e5a3bcca4c6250a2564a6ca9aedf00a623e83;hpb=68f084e4ed817da0c25cefa1772cadf97b8cfe5e;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 942e5a3..bb99994 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -8,7 +8,6 @@
 #include "androidapplicationcomponent.h"
 #include "binarycomponent.h"
 #include "binarypackage.h"
-#include "booleanevaluator.h"
 #include "builder.h"
 #include "datapackcomponent.h"
 #include "file.h"
@@ -108,10 +107,17 @@ void SourcePackage::do_prepare()
 	{
 		string ident = "WITH_"+toupper(i->name);
 		string value = config.get_option("with_"+i->name).value;
-		if(!i->choices.empty())
-			build_info.defines[ident] = value;
-		else if(lexical_cast<bool>(value))
-			build_info.defines[ident] = "1";
+
+		if(i->choices.empty())
+		{
+			if(!lexical_cast<bool>(value))
+				continue;
+			value = "1";
+		}
+
+		build_info.defines[ident] = value;
+		if(i->exported)
+			export_binfo.defines[ident] = value;
 	}
 
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
@@ -145,13 +151,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);
 }
@@ -165,7 +173,6 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	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>);
@@ -230,15 +237,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;