Make the name of a FileTarget be its basename instead of full path

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index e2b25bd6260bfdce4ede32c615dad72a6079b10b..563143f11c56d2c0b5a72b7f5e4fc58327d23f72 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -1,12 +1,18 @@
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <msp/path/path.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
 #include "install.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sourcefile.h"
 #include "target.h"
 
 using namespace std;
@@ -19,11 +25,10 @@ Analyzer::Analyzer(Builder &b):
        full_paths(false)
 { }
 
-/**
-Performs the analysis and prints out the resulting dependency tree.
-*/
 void Analyzer::analyze()
 {
+       table.clear();
+
        TableRow row;
        row.push_back("Name");
        row.push_back("Package");
@@ -36,37 +41,32 @@ void Analyzer::analyze()
        print_table();
 }
 
-/**
-Adds rows to the table for the given target and it' dependencies.
-
-@param   tgt    Target to be processed
-@param   depth  Recursion level of the target (top level is 0)
-*/
 void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 {
        if(mode!=REBUILD && mode!=ALLDEPS)
        {
                // Skip trivial targets
-               if(dynamic_cast<ObjectFile *>(&tgt))
-                       return build_depend_table(*tgt.get_depends().front(), depth);
-               else if(dynamic_cast<Install *>(&tgt))
-                       return build_depend_table(*tgt.get_depends().front(), depth);
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(&tgt))
+                       return build_depend_table(obj->get_source(), depth);
+               else if(Install *inst = dynamic_cast<Install *>(&tgt))
+                       return build_depend_table(inst->get_source(), depth);
        }
        else if(mode==REBUILD && !tgt.get_rebuild())
                /* All targets that depend on to-be-built targets will be rebuilt
-                  themselves, so we cn stop here. */
+               themselves, so we cn stop here. */
                return;
        
        TableRow row;
 
-       string fn;
-       if(full_paths)
-               fn=tgt.get_name();
+       string name;
+       FileTarget *ft = dynamic_cast<FileTarget *>(&tgt);
+       if(full_paths && ft)
+               name = ft->get_path().str();
        else
-               fn=Path::Path(tgt.get_name())[-1];
-       row.push_back(string(depth*2, ' ')+fn);
+               name = tgt.get_name();
+       row.push_back(string(depth*2, ' ')+name);
 
-       const Package *pkg=tgt.get_package();
+       const Package *pkg = tgt.get_package();
        if(pkg)
                row.push_back(pkg->get_name());
        else
@@ -86,7 +86,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
        if(!max_depth || depth<max_depth-1)
        {
-               const TargetList &depends=tgt.get_depends();
+               const TargetList &depends = tgt.get_depends();
                //XXX If we want to sort the targets, we need to take the value of full_paths into account
                //depends.sort(target_order);
                for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -94,12 +94,9 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        }
 }
 
-/**
-Prints out the table that resulted from the analysis.
-*/
 void Analyzer::print_table() const
 {
-       vector<unsigned> col_width;
+       vector<string::size_type> col_width;
 
        // Determine column widths
        for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
@@ -107,20 +104,19 @@ void Analyzer::print_table() const
                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());
+                       col_width[j] = max(col_width[j], (*i)[j].size());
        }
 
        for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
        {
-               ostringstream ss;
-               ss<<left;
+               string line;
                for(unsigned j=0; j<i->size(); ++j)
                {
                        if(j>0)
-                               ss<<"  ";
-                       ss<<setw(col_width[j])<<(*i)[j];
+                               line += "  ";
+                       line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
                }
-               cout<<ss.str()<<'\n';
+               IO::print("%s\n", line);
        }
 }