Move file-to-target mapping to a separate class

[builder.git] / source / install.cpp

diff --git a/source/install.cpp b/source/install.cpp
index 0578ba7173db105f0e983ceed43d8d4a185a5fa0..7c39ed6f4204a046a1ab0a57f69a49f55e29a30f 100644 (file)
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "copy.h"
@@ -26,6 +19,13 @@ Install::Install(Builder &b, const SourcePackage &p, FileTarget &s, const std::s
 {
        buildable = true;
        add_depend(&source);
+
+       if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
+               if(!shlib->get_soname().empty())
+                       link = FS::dirname(path)/FS::basename(shlib->get_path());
+
+       if(!link.empty())
+               builder.get_vfs().register_path(link, this);
 }
 
 Target *Install::get_real_target()
@@ -43,15 +43,10 @@ void Install::check_rebuild()
                mark_rebuild(source.get_name()+" needs rebuilding");
 }
 
-Action *Install::create_action()
-{
-       return new Copy(builder, *package, source.get_path(), path);
-}
-
 FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string &loc)
 {
        if(!tgt.get_package())
-               throw InvalidParameterValue("Can't install package-less targets");
+               throw invalid_argument("Can't install package-less targets");
 
        FS::Path base = tgt.get_package()->get_builder().get_prefix();
        string tgtname = FS::basename(tgt.get_path());
@@ -62,7 +57,7 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string
        else if(const Header *hdr = dynamic_cast<const Header *>(&tgt))
        {
                if(hdr->get_component()->get_type()!=Component::HEADERS)
-                       throw Exception("Header install from non-header component?");
+                       throw logic_error("Header install from non-header component?");
                mid = "include/"+hdr->get_component()->get_name();
        }
        else if(dynamic_cast<const Executable *>(&tgt))
@@ -87,7 +82,7 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string
                mid = "share/"+tgt.get_package()->get_name();
 
        if(mid.empty())
-               throw InvalidParameterValue("Don't know where to install "+tgtname);
+               throw invalid_argument("Don't know where to install "+tgtname);
 
-       return (base/mid/tgtname).str();
+       return base/mid/tgtname;
 }