X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidassetpackagingtool.cpp;h=9e0fef75a990f8252d226ceda12dd396fe84fe60;hb=HEAD;hp=0ef99a7dca4ea9d150203b0205aaab8a7f18f356;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/androidassetpackagingtool.cpp b/source/androidassetpackagingtool.cpp
deleted file mode 100644
index 0ef99a7..0000000
--- a/source/androidassetpackagingtool.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <msp/fs/utils.h>
-#include "androidassetpackagingtool.h"
-#include "androidmanifestfile.h"
-#include "androidresourcebundle.h"
-#include "androidtools.h"
-#include "component.h"
-#include "externaltask.h"
-#include "sourcepackage.h"
-
-using namespace std;
-using namespace Msp;
-
-AndroidAssetPackagingTool::AndroidAssetPackagingTool(Builder &b, const AndroidSdk &s):
-	Tool(b, "AAPT"),
-	sdk(s)
-{
-	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");
-}
-
-Target *AndroidAssetPackagingTool::create_target(const list<Target *> &sources, const string &)
-{
-	AndroidManifestFile *manifest = 0;
-	list<FileTarget *> resources;
-	for(Target *s: sources)
-	{
-		if(AndroidManifestFile *m = dynamic_cast<AndroidManifestFile *>(s))
-			manifest = m;
-		else if(FileTarget *f = dynamic_cast<FileTarget *>(s))
-			resources.push_back(f);
-	}
-
-	if(!manifest)
-		throw invalid_argument("AndroidAssetPackagingTool::create_target");
-
-	AndroidResourceBundle *res = new AndroidResourceBundle(builder, *manifest->get_component(), *manifest, resources);
-	res->set_tool(*this);
-	return res;
-}
-
-Task *AndroidAssetPackagingTool::run(const Target &tgt) const
-{
-	const AndroidResourceBundle &res = dynamic_cast<const AndroidResourceBundle &>(tgt);
-
-	ExternalTask::Arguments argv;
-	argv.push_back(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("-F");
-	argv.push_back(FS::relative(res.get_path(), work_dir).str());
-
-	list<FS::Path> resource_dirs;
-	for(Target *d: res.get_dependencies())
-	{
-		FileTarget *file = dynamic_cast<FileTarget *>(d);
-		Target *real = d->get_real_target();
-
-		if(dynamic_cast<AndroidManifestFile *>(real))
-		{
-			argv.push_back("-M");
-			argv.push_back(FS::relative(file->get_path(), work_dir).str());
-		}
-		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));
-		}
-	}
-
-	set<string> seen_dirs;
-	for(const FS::Path &d: resource_dirs)
-		if(seen_dirs.insert(d.str()).second)
-		{
-			argv.push_back("-S");
-			argv.push_back(FS::relative(d, work_dir).str());
-		}
-
-	return new ExternalTask(argv, work_dir);
-}