Add install component type

[builder.git] / source / install.cpp

diff --git a/source/install.cpp b/source/install.cpp
index 1eb510e4505f768f49d82aebadfddcd51e126cc4..a0029ac1eed33244fea945686d43347d3a8b6628 100644 (file)
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -19,8 +19,8 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-Install::Install(Builder &b, const SourcePackage &p, FileTarget &s):
-       FileTarget(b, &p, generate_target_path(s)),
+Install::Install(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc):
+       FileTarget(b, &p, generate_target_path(s, loc)),
        source(s)
 {
        buildable=true;
@@ -42,16 +42,23 @@ Action *Install::create_action()
        return new Copy(builder, *package, source.get_path(), path);
 }
 
-FS::Path Install::generate_target_path(const FileTarget &tgt)
+FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string &loc)
 {
-       const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(tgt.get_package());
+       if(!tgt.get_package())
+               throw InvalidParameterValue("Can't install package-less targets");
 
-       FS::Path base=spkg->get_builder().get_prefix();
+       FS::Path base=tgt.get_package()->get_builder().get_prefix();
        string tgtname=FS::basename(tgt.get_path());
 
        string mid;
-       if(const Header *hdr=dynamic_cast<const Header *>(&tgt))
-               mid="include/"+hdr->get_component()->get_install_headers();
+       if(!loc.empty())
+               mid=loc;
+       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?");
+               mid="include/"+hdr->get_component()->get_name();
+       }
        else if(dynamic_cast<const Executable *>(&tgt))
                mid="bin";
        else if(const SharedLibrary *shlib=dynamic_cast<const SharedLibrary *>(&tgt))