X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=e26c1157ec88ff5b06a3f08710d41a16cfcbf442;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=81f4d8e3d481f30b236abd8cdd90e389705cb4b5;hpb=0d95fee118a3fcd78f153dca5721d9fe19b6f6bf;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 81f4d8e..e26c115 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -7,23 +7,20 @@
 #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 "copy.h"
+#include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
-#include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
-#include "gnulinker.h"
+#include "gnutools.h"
 #include "installedfile.h"
-#include "mingwdlltool.h"
+#include "microsofttools.h"
 #include "package.h"
-#include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "tar.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -64,6 +61,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);
@@ -81,15 +87,16 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-	toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
-	toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
-	toolchain.add_tool(new GnuLinker(*this, *current_arch));
-	toolchain.add_tool(new GnuArchiver(*this, *current_arch));
-	toolchain.add_tool(new Copy(*this));
-	toolchain.add_tool(new Tar(*this));
-	toolchain.add_tool(new PkgConfigGenerator(*this));
-	if(current_arch->get_system()=="windows")
-		toolchain.add_tool(new MingwDllTool(*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=="msvc")
+		toolchain.add_toolchain(new MicrosoftTools(*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));
 }
 
@@ -162,6 +169,13 @@ void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *op
 	loader.load(parser);
 }
 
+void Builder::save_caches()
+{
+	const PackageManager::PackageMap &packages = package_manager.get_packages();
+	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+		i->second->save_caches();
+}
+
 int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
 {
 	unsigned total = build_graph.count_rebuild_targets();
@@ -249,13 +263,6 @@ int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
 	else if(show_progress)
 		get_logger().log("summary", "Build complete");
 
-	if(!dry_run)
-	{
-		const PackageManager::PackageMap &packages = package_manager.get_packages();
-		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-			i->second->save_caches();
-	}
-
 	return fail;
 }
 
@@ -265,12 +272,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);
@@ -300,7 +307,6 @@ Builder::Loader::Loader(Builder &b, const Config::InputOptions *o, bool a):
 	add("architecture", &Loader::architecture);
 	add("binary_package", &Loader::binpkg);
 	add("build_type", &Loader::build_type);
-	add("profile", &Loader::profile);
 	add("package", &Loader::package);
 
 	if(!obj.top_loader)
@@ -336,11 +342,6 @@ void Builder::Loader::build_type(const string &n)
 		obj.build_type = &i->second;
 }
 
-void Builder::Loader::profile(const string &)
-{
-	IO::print("Profiles are deprecated\n");
-}
-
 void Builder::Loader::package(const string &n)
 {
 	SourcePackage *pkg = new SourcePackage(obj, n, get_source());