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

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 2742300..1a23c47 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,10 +5,11 @@
 #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 "compilecommandsjson.h"
 #include "datapackcomponent.h"
 #include "file.h"
 #include "installcomponent.h"
@@ -17,6 +18,7 @@
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
 #include "tool.h"
+#include "vcxprojectfile.h"
 
 using namespace std;
 using namespace Msp;
@@ -107,10 +109,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)
@@ -126,14 +135,23 @@ void SourcePackage::do_prepare()
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
 		(*i)->create_targets();
 
+	const Architecture &arch = builder.get_native_arch();
 	if(!export_binfo.libs.empty())
 	{
 		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
 		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
-		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-		builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		if(arch.get_system()=="linux")
+		{
+			PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+			builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		}
 	}
+
+	if(arch.get_system()=="windows")
+		new VcxProjectFile(builder, *this);
+
+	new CompileCommandsJson(builder, *this);
 }
 
 void SourcePackage::save_caches()
@@ -144,13 +162,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 +178,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 +248,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;