X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidmanifestgenerator.cpp;h=0c489825824784a6af316572406a1d338a256691;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=1d2f330da0f6dbf75ea8053c7fc2e3e27e9bceae;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index 1d2f330..0c48982 100644
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -3,6 +3,7 @@
 #include "androidmanifestfile.h"
 #include "androidmanifestgenerator.h"
 #include "component.h"
+#include "internaltask.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -11,26 +12,16 @@ using namespace Msp;
 
 AndroidManifestGenerator::AndroidManifestGenerator(Builder &b):
 	Tool(b, "AMG")
-{ }
-
-Target *AndroidManifestGenerator::create_target(const list<Target *> &, const string &)
 {
-	throw logic_error("not implemented");
+	set_run_internal(_run);
 }
 
-Task *AndroidManifestGenerator::run(const Target &target) const
+Target *AndroidManifestGenerator::create_target(const vector<Target *> &, const string &)
 {
-	const AndroidManifestFile &manifest = dynamic_cast<const AndroidManifestFile &>(target);
-	Worker *worker = new Worker(manifest);
-	return new InternalTask(worker);
+	throw logic_error("not implemented");
 }
 
-
-AndroidManifestGenerator::Worker::Worker(const AndroidManifestFile &m):
-	manifest(m)
-{ }
-
-void AndroidManifestGenerator::Worker::main()
+bool AndroidManifestGenerator::_run(const AndroidManifestFile &manifest)
 {
 	const Component &comp = *manifest.get_component();
 	const SourcePackage &pkg = comp.get_package();
@@ -64,5 +55,5 @@ void AndroidManifestGenerator::Worker::main()
 		IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", p);
 	out.write("</manifest>\n");
 
-	status = Task::SUCCESS;
+	return true;
 }