X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=7ef1ea1dcfd6d498969647a4cc7fe6f71f669db1;hb=d914c5f40ca1194e7fd6a2b30664ac4717e38786;hp=cf49f41663e71b45d16dd16bc2a73d0ff5915449;hpb=88e3ad4afa2010507227c0c0ffb9d1ce08f61e2a;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index cf49f41..7ef1ea1 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -7,11 +7,13 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
+#include "androidtools.h"
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
 #include "gnutools.h"
 #include "installedfile.h"
@@ -58,6 +60,15 @@ void Builder::set_architecture(const string &name)
 	}
 }
 
+vector<string> Builder::get_build_types() const
+{
+	vector<string> keys;
+	keys.reserve(build_types.size());
+	for(BuildTypeMap::const_iterator i=build_types.begin(); i!=build_types.end(); ++i)
+		keys.push_back(i->first);
+	return keys;
+}
+
 void Builder::set_build_type(const string &name)
 {
 	build_type = &get_item(build_types, name);
@@ -75,7 +86,13 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-	toolchain.add_toolchain(new GnuTools(*this, *current_arch));
+	const string &arch_tc = current_arch->get_toolchain();
+	if(current_arch->get_system()=="android")
+		toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
+	else if(arch_tc=="clang")
+		toolchain.add_toolchain(new ClangTools(*this, *current_arch));
+	else if(arch_tc=="gnu")
+		toolchain.add_toolchain(new GnuTools(*this, *current_arch));
 	toolchain.add_toolchain(new BuiltinTools(*this));
 	toolchain.add_tool(new DataTool(*this));
 }
@@ -252,12 +269,12 @@ int Builder::clean(bool all, bool dry_run)
 
 	set<Target *> clean_tgts;
 	list<Target *> queue;
-	queue.push_back(build_graph.get_target("cmdline"));
+	queue.push_back(&build_graph.get_goals());
 
 	while(!queue.empty())
 	{
 		Target *tgt = queue.front();
-		queue.erase(queue.begin());
+		queue.pop_front();
 
 		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
 			clean_tgts.insert(tgt);