X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9e1b68dd43d60b4b81d61f2c65051412d7286fa6;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=1dd7dbd1062263b91f71bc7fd0cd007cd28e8f97;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1dd7dbd..9e1b68d 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,18 +5,18 @@
 #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"
 #include "installcomponent.h"
 #include "pkgconfigfile.h"
-#include "tarballcomponent.h"
-#include "tool.h"
+#include "sourcearchivecomponent.h"
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -33,8 +33,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	build_file = builder.get_vfs().get_target(f);
 	if(!build_file)
 		build_file = new File(builder, *this, f);
-	source_tarball = new TarballComponent(*this, "@src");
-	components.push_back(source_tarball);
+	source_archive = new SourceArchiveComponent(*this);
+	components.push_back(source_archive);
 }
 
 SourcePackage::~SourcePackage()
@@ -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,18 +160,19 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
 	options = o;
-	add("description", &SourcePackage::description);
+	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("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
-	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
-	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
 	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
-	add("datapack",    &Loader::component<DataPackComponent>);
-	add("source_tarball", &Loader::source_tarball);
+	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
+	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
+	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
+	add("source_archive", &Loader::source_archive);
+	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);
 	add("version",     &Loader::version);
 }
@@ -178,7 +181,7 @@ void SourcePackage::Loader::finish()
 {
 	/* Make sure the source tarball is last in the list so targets from all
 	other components wil be created first */
-	ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_tarball);
+	ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_archive);
 	if(i!=obj.components.end())
 		obj.components.splice(obj.components.end(), obj.components, i);
 }
@@ -227,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;
@@ -243,15 +237,14 @@ void SourcePackage::Loader::interface_version(const string &v)
 		obj.version = v;
 }
 
-void SourcePackage::Loader::source_tarball()
+void SourcePackage::Loader::source_archive()
 {
-	load_sub(*obj.source_tarball);
+	load_sub(*obj.source_archive);
 }
 
-void SourcePackage::Loader::tarball(const string &n)
+void SourcePackage::Loader::tarball(const string &)
 {
-	TarballComponent trbl(obj, n);
-	load_sub(trbl);
+	IO::print("%s: Deprecated tarball component ignored\n", get_source());
 }
 
 void SourcePackage::Loader::version(const string &v)