Remove a useless path-to-string conversion

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index dac7bb84a43c6f68c577331b2294955309982f08..7704a9634a0e7b086276086ddac50a236a3fc9d8 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,23 +1,14 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
 #include <cstdlib>
-#include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/buffered.h>
-#include <msp/io/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
@@ -114,7 +105,7 @@ Builder::Builder(int argc, char **argv):
                else if(analyze_mode=="rdeps")
                        analyzer->set_mode(Analyzer::RDEPS);
                else
-                       throw UsageError("Invalid analyze mode");
+                       throw usage_error("Invalid analyze mode");
 
                analyzer->set_max_depth(max_depth);
                analyzer->set_full_paths(full_paths);
@@ -337,7 +328,7 @@ string Builder::run_pkgconfig(const string &pkg, const string &what)
        int status;
        string res = run_command(argv, &status);
        if(status)
-               throw Exception(format("pkg-config for package %s failed", pkg));
+               throw runtime_error(format("pkg-config for package %s failed", pkg));
 
        return res;
 }
@@ -379,13 +370,20 @@ Package *Builder::get_package(const string &name)
 
 Target *Builder::get_target(const string &n) const
 {
-       // XXX Used for getting targets by path.  get_target(const FS::Path &)?
        TargetMap::const_iterator i = targets.find(n);
        if(i!=targets.end())
                return i->second;
        return 0;
 }
 
+FileTarget *Builder::get_target_by_path(const FS::Path &p) const
+{
+       TargetMap::const_iterator i = targets_by_path.find(p.str());
+       if(i!=targets_by_path.end())
+               return static_cast<FileTarget *>(i->second);
+       return 0;
+}
+
 Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
 {
        string hash(8, 0);
@@ -463,6 +461,10 @@ Target *Builder::get_library(const string &lib, const list<string> &path, LibMod
        {
                syspath.push_back("/lib");
                syspath.push_back("/usr/lib");
+               if(current_arch->match_name("pc-32-linux"))
+                       syspath.push_back("/usr/lib/i386-linux-gnu");
+               else if(current_arch->match_name("pc-64-linux"))
+                       syspath.push_back("/usr/lib/x86_64-linux-gnu");
        }
        else
                syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib");
@@ -500,16 +502,15 @@ void Builder::problem(const string &p, const string &d)
        problems.push_back(Problem(p, d));
 }
 
-void Builder::add_target(FileTarget *t)
+void Builder::add_target(Target *t)
 {
-       targets.insert(TargetMap::value_type(t->get_path().str(), t));
+       targets.insert(TargetMap::value_type(t->get_name(), t));
        new_tgts.push_back(t);
 }
 
-void Builder::add_target(VirtualTarget *t)
+void Builder::register_path(const FS::Path &path, FileTarget *t)
 {
-       targets.insert(TargetMap::value_type(t->get_name(), t));
-       new_tgts.push_back(t);
+       targets_by_path.insert(TargetMap::value_type(path.str(), t));
 }
 
 void Builder::usage(const char *reason, const char *argv0, bool brief)
@@ -587,7 +588,7 @@ int Builder::load_build_file(const FS::Path &fn)
                Loader loader(*this, fn.subpath(0, fn.size()-1));
                loader.load(parser);
        }
-       catch(const IO::FileNotFound &)
+       catch(const IO::file_not_found &)
        {
                return -1;
        }
@@ -641,7 +642,7 @@ int Builder::create_targets()
        // Apply what-ifs
        for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
        {
-               FileTarget *tgt = dynamic_cast<FileTarget *>(get_target((cwd/ *i).str()));
+               FileTarget *tgt = get_target_by_path(cwd/ *i);
                if(!tgt)
                {
                        IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
@@ -656,7 +657,9 @@ int Builder::create_targets()
        {
                Target *tgt = get_target(*i);
                if(!tgt)
-                       tgt = get_target((cwd/ *i).str());
+                       tgt = get_target_by_path(*i);
+               if(!tgt)
+                       tgt = get_target_by_path(cwd/ *i);
                if(!tgt)
                {
                        IO::print("I don't know anything about %s\n", *i);
@@ -677,7 +680,7 @@ int Builder::create_targets()
 
 Target *Builder::get_header(const FS::Path &fn)
 {
-       Target *tgt = get_target(fn.str());
+       Target *tgt = get_target_by_path(fn);
        if(tgt) return tgt;
 
        if(FS::is_reg(fn))
@@ -713,8 +716,8 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
 
        for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
        {
-               string full = (path/ *i).str();
-               Target *tgt = get_target(full);
+               FS::Path full = path/ *i;
+               Target *tgt = get_target_by_path(full);
 
                if(tgt)
                {
@@ -729,7 +732,7 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
                }
                else if(FS::is_reg(full))
                {
-                       tgt = new SystemLibrary(*this, full);
+                       tgt = new SystemLibrary(*this, full.str());
                        return tgt;
                }
        }
@@ -867,7 +870,6 @@ void Builder::package_help()
        }
 }
 
-Application::RegApp<Builder> Builder::reg;
 string Builder::usagemsg;
 string Builder::helpmsg;