X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=4cebafad175ae6d7cc3a1a2459ffbba4c4d1709e;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=15386784e690353ac751ccf54aea38d56c98770e;hpb=675571163de39c2872ab1b78c8ab0c6b84dac538;p=builder.git

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 1538678..4cebafa 100644
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -2,9 +2,10 @@
 #include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
+#include "buildgraph.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "tool.h"
 
@@ -23,12 +24,12 @@ void Analyzer::analyze()
 	if(mode==RDEPS)
 	{
 		rdepends.clear();
-		const Builder::TargetMap &targets = builder.get_targets();
-		for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+		for(const auto &kvp: builder.get_build_graph().get_targets())
 		{
-			const Target::Dependencies &depends = i->second->get_depends();
-			for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
-				rdepends[*j].insert(i->second);
+			for(Target *d: kvp.second->get_dependencies())
+				rdepends[d].insert(kvp.second);
+			for(Target *d: kvp.second->get_transitive_dependencies())
+				rdepends[d].insert(kvp.second);
 		}
 	}
 
@@ -42,15 +43,14 @@ void Analyzer::analyze()
 	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 Target::Dependencies &deps = cmdline.get_depends();
-		for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-			build_depend_table(**i, 0);
+		for(Target *d: goals.get_dependencies())
+			build_depend_table(*d, 0);
 	}
 	else
-		build_depend_table(cmdline, 0);
+		build_depend_table(goals, 0);
 
 	print_table();
 }
@@ -95,12 +95,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 		row.push_back("");
 
 	if(tgt.needs_rebuild())
-	{
-		if(tgt.get_rebuild_reason().empty())
-			row.push_back("Yes (no reason)");
-		else
-			row.push_back(tgt.get_rebuild_reason());
-	}
+		row.push_back(tgt.get_rebuild_reason());
 
 	table.push_back(row);
 
@@ -113,12 +108,16 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 			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(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
-			build_depend_table(**i, depth+1);
+		for(Target *d: depends)
+			build_depend_table(*d, depth+1);
 	}
 }
 
@@ -127,22 +126,22 @@ void Analyzer::print_table() const
 	vector<string::size_type> col_width;
 
 	// Determine column widths
-	for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
+	for(const vector<string> &r: table)
 	{
-		if(col_width.size()<i->size())
-			col_width.resize(i->size(), 0);
-		for(unsigned j=0; j<i->size(); ++j)
-			col_width[j] = max(col_width[j], (*i)[j].size());
+		if(col_width.size()<r.size())
+			col_width.resize(r.size(), 0);
+		for(unsigned j=0; j<r.size(); ++j)
+			col_width[j] = max(col_width[j], r[j].size());
 	}
 
-	for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
+	for(const vector<string> &r: table)
 	{
 		string line;
-		for(unsigned j=0; j<i->size(); ++j)
+		for(unsigned j=0; j<r.size(); ++j)
 		{
 			if(j>0)
 				line += "  ";
-			line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
+			line += lexical_cast<string>(r[j], Fmt("%-s").width(col_width[j]));
 		}
 		IO::print("%s\n", line);
 	}