Improve target names in announces

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index f775158cea53d73ab9b9f676b49b77f4f59fe0cb..69a1d4048329562aa56029c86eb2c44cbb7ab56c 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,11 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -20,10 +21,10 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-Link::Link(Builder &b, const Executable &exe):
+Link::Link(Builder &b, const Binary &bin):
        ExternalAction(b)
 {
-       const Component &comp=exe.get_component();
+       const Component &comp=bin.get_component();
 
        work_dir=comp.get_package().get_source();
 
@@ -43,29 +44,27 @@ Link::Link(Builder &b, const Executable &exe):
                argv.push_back("-L"+*i);
 
        argv.push_back("-o");
-       argv.push_back(relative(exe.get_name(), work_dir).str());
-       const TargetList &deps=exe.get_depends();
+       argv.push_back(relative(bin.get_path(), work_dir).str());
+       const TargetList &deps=bin.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
                Target *tgt=*i;
-               if(dynamic_cast<Install *>(tgt))
-                       tgt=tgt->get_depends().front();
+               if(Install *inst=dynamic_cast<Install *>(tgt))
+                       tgt=&inst->get_source();
 
-               if(dynamic_cast<ObjectFile *>(tgt))
-                       argv.push_back(relative((*i)->get_name(), work_dir).str());
-               else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
-                       argv.push_back("-l"+shlib->get_libname());
-               else if(dynamic_cast<StaticLibrary *>(tgt))
-                       argv.push_back((*i)->get_name());
-               else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
-                       argv.push_back("-l"+syslib->get_libname());
+               if(ObjectFile *obj=dynamic_cast<ObjectFile *>(tgt))
+                       argv.push_back(relative(obj->get_path(), work_dir).str());
+               else if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(tgt))
+                       argv.push_back(stlib->get_path().str());
+               else if(Library *lib=dynamic_cast<Library *>(tgt))
+                       argv.push_back("-l"+lib->get_libname());
        }
 
-       Path epath=exe.get_name();
+       FS::Path binpath=bin.get_path();
        if(!builder.get_dry_run())
-               mkpath(epath.subpath(0, epath.size()-1), 0755);
+               FS::mkpath(FS::dirname(binpath), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
+       announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str().substr(2));
 
        launch();
 }