Further changes for library compatibility

[builder.git] / source / install.cpp

diff --git a/source/install.cpp b/source/install.cpp
index e59e0d93b090d802e26ed9949eedbb036238826d..ecf50ee6cfa1e73f8c8e62d4f7d05f4a6778fc01 100644 (file)
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -28,6 +28,11 @@ Install::Install(Builder &b, const SourcePackage &p, FileTarget &s, const std::s
        add_depend(&source);
 }
 
+Target *Install::get_real_target()
+{
+       return source.get_real_target();
+}
+
 void Install::check_rebuild()
 {
        if(!mtime)
@@ -46,7 +51,7 @@ Action *Install::create_action()
 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());
@@ -57,7 +62,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))
@@ -66,7 +71,11 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string
        {
                const Component &comp = shlib->get_component();
                if(comp.get_type()==Component::LIBRARY)
+               {
                        mid = "lib";
+                       if(!shlib->get_soname().empty())
+                               tgtname = shlib->get_soname();
+               }
                else if(comp.get_type()==Component::MODULE)
                        mid = "lib/"+tgt.get_package()->get_name();
        }
@@ -78,7 +87,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();
 }