X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=2c9cf058d7a565d3849acca028e150d878f4e85c;hb=74ea8208bb1aa1d9afc9657a4cdfac6714241887;hp=306bc4d736b68b999f940546b0a90f9880e962d3;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 306bc4d..2c9cf05 100644
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -2,11 +2,12 @@
 #include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
-#include "install.h"
+#include "buildgraph.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 #include "target.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -23,11 +24,14 @@ void Analyzer::analyze()
 	if(mode==RDEPS)
 	{
 		rdepends.clear();
-		const TargetMap &targets = builder.get_targets();
-		for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+		const BuildGraph::TargetMap &targets = builder.get_build_graph().get_targets();
+		for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
 		{
-			const TargetList &depends = i->second->get_depends();
-			for(TargetList::const_iterator j=depends.begin(); j!=depends.end(); ++j)
+			const Target::Dependencies &depends = i->second->get_dependencies();
+			for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
+				rdepends[*j].insert(i->second);
+			const Target::Dependencies &tdepends = i->second->get_transitive_dependencies();
+			for(Target::Dependencies::const_iterator j=tdepends.begin(); j!=tdepends.end(); ++j)
 				rdepends[*j].insert(i->second);
 		}
 	}
@@ -38,18 +42,19 @@ void Analyzer::analyze()
 	row.push_back("Name");
 	row.push_back("Package");
 	row.push_back("Type");
+	row.push_back("Tool");
 	row.push_back("Rebuild");
 	table.push_back(row);
 	
-	Target &cmdline = *builder.get_target("cmdline");
+	Target &goals = builder.get_build_graph().get_goals();
 	if(mode==RDEPS)
 	{
-		const TargetList &deps = cmdline.get_depends();
-		for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+		const Target::Dependencies &deps = goals.get_dependencies();
+		for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			build_depend_table(**i, 0);
 	}
 	else
-		build_depend_table(cmdline, 0);
+		build_depend_table(goals, 0);
 
 	print_table();
 }
@@ -65,7 +70,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 		if(const ObjectFile *obj = dynamic_cast<const ObjectFile *>(&tgt))
 			return build_depend_table(obj->get_source(), depth);
 	}
-	else if(mode==REBUILD && !tgt.get_rebuild() && !real->get_rebuild())
+	else if(mode==REBUILD && !tgt.needs_rebuild())
 		/* All targets that depend on to-be-built targets will be rebuilt
 		themselves, so we can stop here. */
 		return;
@@ -87,31 +92,35 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 		row.push_back("");
 	
 	row.push_back(tgt.get_type());
-	
-	if(tgt.get_rebuild())
-	{
-		if(tgt.get_rebuild_reason().empty())
-			row.push_back("Yes (no reason)");
-		else
-			row.push_back(tgt.get_rebuild_reason());
-	}
+	const Tool *tool = tgt.get_tool();
+	if(tool)
+		row.push_back(tool->get_tag());
+	else
+		row.push_back("");
+
+	if(tgt.needs_rebuild())
+		row.push_back(tgt.get_rebuild_reason());
 
 	table.push_back(row);
 
 	if(!max_depth || depth<max_depth-1)
 	{
-		TargetList depends;
+		Target::Dependencies depends;
 		if(mode==RDEPS)
 		{
 			const set<Target *> &rdeps = rdepends[&tgt];
 			depends.assign(rdeps.begin(), rdeps.end());
 		}
 		else
-			depends = tgt.get_depends();
+		{
+			depends = tgt.get_dependencies();
+			const Target::Dependencies &tdeps = tgt.get_transitive_dependencies();
+			depends.insert(depends.end(), tdeps.begin(), tdeps.end());
+		}
 
 		depends.sort(full_paths ? target_order_full : target_order);
 
-		for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+		for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 			build_depend_table(**i, depth+1);
 	}
 }
@@ -136,7 +145,7 @@ void Analyzer::print_table() const
 		{
 			if(j>0)
 				line += "  ";
-			line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
+			line += lexical_cast<string>((*i)[j], Fmt("%-s").width(col_width[j]));
 		}
 		IO::print("%s\n", line);
 	}