X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=07007f61bd75c82ae9f80d5e35315e29b7374b23;hb=c51e8844f19c31b2809ba459a1659d3b94a86f89;hp=813f8ed788deff1c85f8eca5810134e85f8cfb63;hpb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 813f8ed..07007f6 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -16,6 +16,7 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "copy.h"
+#include "datatool.h"
 #include "gnuarchiver.h"
 #include "gnuccompiler.h"
 #include "gnucxxcompiler.h"
@@ -38,6 +39,7 @@ Builder::Builder(int argc, char **argv):
 	native_arch(*this, string()),
 	build_type(0),
 	vfs(*this),
+	build_graph(*this),
 	analyzer(0),
 	build(false),
 	clean(0),
@@ -149,9 +151,6 @@ Builder::Builder(int argc, char **argv):
 			cmdline_targets.push_back(*i);
 	}
 
-	if(cmdline_targets.empty())
-		cmdline_targets.push_back("default");
-
 	if(!work_dir.empty())
 		FS::chdir(work_dir);
 
@@ -205,12 +204,11 @@ Builder::Builder(int argc, char **argv):
 	toolchain.add_tool(new PkgConfigGenerator(*this));
 	if(current_arch->get_system()=="windows")
 		toolchain.add_tool(new MingwDllTool(*this, *current_arch));
+	toolchain.add_tool(new DataTool(*this));
 }
 
 Builder::~Builder()
 {
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		delete i->second;
 	delete analyzer;
 }
 
@@ -271,7 +269,8 @@ int Builder::main()
 
 			unsigned count = 0;
 			unsigned to_be_built = 0;
-			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+			const BuildGraph::TargetMap &targets = build_graph.get_targets();
+			for(BuildGraph::TargetMap::const_iterator j=targets.begin(); j!=targets.end(); ++j)
 				if(j->second->get_package()==i->second)
 				{
 					++count;
@@ -290,7 +289,7 @@ int Builder::main()
 		package_details.push_back(line);
 	}
 
-	logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
+	logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size()));
 	for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
 		logger.log("packages", *i);
 
@@ -315,42 +314,11 @@ int Builder::main()
 	return exit_code;
 }
 
-Target *Builder::get_target(const string &n) const
-{
-	TargetMap::const_iterator i = targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
-}
-
 void Builder::problem(const string &p, const string &d)
 {
 	problems.push_back(Problem(p, d));
 }
 
-void Builder::add_target(Target *t)
-{
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-}
-
-void Builder::add_primary_target(Target &t)
-{
-	get_target("world")->add_dependency(t);
-
-	if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default())
-		get_target("default")->add_dependency(t);
-}
-
-void Builder::add_installed_target(Target &t)
-{
-	Target *inst_tgt = 0;
-	if(const Tool *tool = t.get_tool())
-		inst_tgt = tool->create_install(t);
-	if(!inst_tgt)
-		inst_tgt = toolchain.get_tool("CP").create_target(t);
-	get_target("install")->add_dependency(*inst_tgt);
-}
-
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
 	if(reason)
@@ -380,24 +348,12 @@ void Builder::load_build_file(const FS::Path &fn)
 
 bool Builder::prepare_build()
 {
-	Target *world = new VirtualTarget(*this, "world");
-
-	Target *def_tgt = new VirtualTarget(*this, "default");
-	world->add_dependency(*def_tgt);
-
-	Target *install = new VirtualTarget(*this, "install");
-	world->add_dependency(*install);
-
-	Target *tarballs = new VirtualTarget(*this, "tarballs");
-	world->add_dependency(*tarballs);
-
 	package_manager.get_main_package().prepare();
 
-	// Make the cmdline target depend on all targets mentioned on the command line
-	Target *cmdline = new VirtualTarget(*this, "cmdline");
+	// Add targets from command line as goals
 	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
-		Target *tgt = get_target(*i);
+		Target *tgt = build_graph.get_target(*i);
 		if(!tgt)
 			tgt = vfs.get_target(*i);
 		if(!tgt)
@@ -408,10 +364,10 @@ bool Builder::prepare_build()
 			return false;
 		}
 
-		cmdline->add_dependency(*tgt);
+		build_graph.add_goal(*tgt);
 	}
 
-	cmdline->prepare();
+	build_graph.prepare();
 
 	// Apply what-ifs
 	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
@@ -426,11 +382,7 @@ bool Builder::prepare_build()
 	}
 
 	if(build_all)
-	{
-		for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-			if(i->second->is_buildable() && !i->second->needs_rebuild())
-				i->second->force_rebuild();
-	}
+		build_graph.force_full_rebuild();
 
 	if(!dry_run)
 	{
@@ -444,12 +396,7 @@ bool Builder::prepare_build()
 
 int Builder::do_build()
 {
-	Target *cmdline = get_target("cmdline");
-
-	unsigned total = 0;
-	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && i->second->needs_rebuild())
-			++total;
+	unsigned total = build_graph.count_rebuild_targets();
 
 	if(!total)
 	{
@@ -470,7 +417,7 @@ int Builder::do_build()
 	{
 		if(tasks.size()<jobs && !fail && !starved)
 		{
-			Target *tgt = cmdline->get_buildable_target();
+			Target *tgt = build_graph.get_buildable_target();
 			if(tgt)
 			{
 				if(tgt->get_tool())
@@ -550,7 +497,7 @@ int Builder::do_clean()
 
 	set<Target *> clean_tgts;
 	list<Target *> queue;
-	queue.push_back(get_target("cmdline"));
+	queue.push_back(build_graph.get_target("cmdline"));
 
 	while(!queue.empty())
 	{