X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidassetpackagingtool.cpp;h=a511da04986ba65eae493f31965e1becfbb4a5c5;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=cca30b806168f615124058e0d028d27530d826d7;hpb=68f084e4ed817da0c25cefa1772cadf97b8cfe5e;p=builder.git

diff --git a/source/androidassetpackagingtool.cpp b/source/androidassetpackagingtool.cpp
index cca30b8..a511da0 100644
--- a/source/androidassetpackagingtool.cpp
+++ b/source/androidassetpackagingtool.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include "androidassetpackagingtool.h"
 #include "androidmanifestfile.h"
@@ -14,18 +15,29 @@ AndroidAssetPackagingTool::AndroidAssetPackagingTool(Builder &b, const AndroidSd
 	Tool(b, "AAPT"),
 	sdk(s)
 {
-	set_command((sdk.get_build_tools_dir()/"aapt").str());
+	if(sdk.get_root_dir().empty())
+		problems.push_back("Android SDK not found");
+	else if(sdk.get_build_tools_dir().empty())
+		problems.push_back("Android build-tools not found");
+	else
+		set_command((sdk.get_build_tools_dir()/"aapt").str());
+
+	if(sdk.get_platform_jar().empty())
+		problems.push_back("Android platform not found");
+
+	set_run(_run);
 }
 
-Target *AndroidAssetPackagingTool::create_target(const list<Target *> &sources, const string &)
+Target *AndroidAssetPackagingTool::create_target(const vector<Target *> &sources, const string &)
 {
 	AndroidManifestFile *manifest = 0;
-	list<FileTarget *> resources;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	vector<FileTarget *> resources;
+	resources.reserve(sources.size());
+	for(Target *s: sources)
 	{
-		if(AndroidManifestFile *m = dynamic_cast<AndroidManifestFile *>(*i))
+		if(AndroidManifestFile *m = dynamic_cast<AndroidManifestFile *>(s))
 			manifest = m;
-		else if(FileTarget *f = dynamic_cast<FileTarget *>(*i))
+		else if(FileTarget *f = dynamic_cast<FileTarget *>(s))
 			resources.push_back(f);
 	}
 
@@ -37,28 +49,28 @@ Target *AndroidAssetPackagingTool::create_target(const list<Target *> &sources,
 	return res;
 }
 
-Task *AndroidAssetPackagingTool::run(const Target &tgt) const
+Task *AndroidAssetPackagingTool::_run(const AndroidResourceBundle &res)
 {
-	const AndroidResourceBundle &res = dynamic_cast<const AndroidResourceBundle &>(tgt);
+	const AndroidAssetPackagingTool &tool = dynamic_cast<const AndroidAssetPackagingTool &>(*res.get_tool());
 
 	ExternalTask::Arguments argv;
-	argv.push_back(executable->get_path().str());
+	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("package");
 
 	FS::Path work_dir = res.get_component()->get_package().get_source_directory();
 
 	argv.push_back("-I");
-	argv.push_back(sdk.get_platform_jar().str());
+	argv.push_back(tool.sdk.get_platform_jar().str());
 
 	argv.push_back("-F");
 	argv.push_back(FS::relative(res.get_path(), work_dir).str());
 
-	const Target::Dependencies &depends = res.get_dependencies();
-	list<FS::Path> resource_dirs;
-	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+	vector<FS::Path> resource_dirs;
+	resource_dirs.reserve(res.get_dependencies().size());
+	for(Target *d: res.get_dependencies())
 	{
-		FileTarget *file = dynamic_cast<FileTarget *>(*i);
-		Target *real = (*i)->get_real_target();
+		FileTarget *file = dynamic_cast<FileTarget *>(d);
+		Target *real = d->get_real_target();
 
 		if(dynamic_cast<AndroidManifestFile *>(real))
 		{
@@ -68,17 +80,17 @@ Task *AndroidAssetPackagingTool::run(const Target &tgt) const
 		else if(real->get_package()==res.get_package())
 		{
 			const FS::Path &path = file->get_path();
-			resource_dirs.push_back(path.subpath(0, path.size()-2));
+			FS::Path res_dir = path.subpath(0, path.size()-2);
+			if(!any_equals(resource_dirs, res_dir))
+				resource_dirs.push_back(res_dir);
 		}
 	}
 
-	set<string> seen_dirs;
-	for(list<FS::Path>::const_iterator i=resource_dirs.begin(); i!=resource_dirs.end(); ++i)
-		if(seen_dirs.insert(i->str()).second)
-		{
-			argv.push_back("-S");
-			argv.push_back(FS::relative(*i, work_dir).str());
-		}
+	for(const FS::Path &d: resource_dirs)
+	{
+		argv.push_back("-S");
+		argv.push_back(FS::relative(d, work_dir).str());
+	}
 
 	return new ExternalTask(argv, work_dir);
 }