Rework the Target class hierarchy

[builder.git] / source / install.cpp

diff --git a/source/install.cpp b/source/install.cpp
index d30eea03a060fd4d2e6aafa42548a342ceb1a5e3..1eb510e4505f768f49d82aebadfddcd51e126cc4 100644 (file)
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -13,54 +13,52 @@ Distributed under the LGPL
 #include "install.h"
 #include "package.h"
 #include "pkgconfig.h"
+#include "sharedlibrary.h"
 #include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
-Install::Install(Builder &b, const SourcePackage &p, Target &tgt):
-       Target(b, &p, generate_target_name(tgt))
+Install::Install(Builder &b, const SourcePackage &p, FileTarget &s):
+       FileTarget(b, &p, generate_target_path(s)),
+       source(s)
 {
        buildable=true;
-       add_depend(&tgt);
+       add_depend(&source);
 }
 
 void Install::check_rebuild()
 {
        if(!mtime)
                mark_rebuild("Does not exist");
-       else
-       {
-               Target *dep=depends.front();
-               if(dep->get_mtime()>mtime)
-                       mark_rebuild(FS::basename(dep->get_name())+" has changed");
-               else if(dep->get_rebuild())
-                       mark_rebuild(FS::basename(dep->get_name())+" needs rebuilding");
-       }
+       else if(source.get_mtime()>mtime)
+               mark_rebuild(FS::basename(source.get_name())+" has changed");
+       else if(source.get_rebuild())
+               mark_rebuild(FS::basename(source.get_name())+" needs rebuilding");
 }
 
 Action *Install::create_action()
 {
-       return new Copy(builder, *package, depends.front()->get_name(), name);
+       return new Copy(builder, *package, source.get_path(), path);
 }
 
-string Install::generate_target_name(const Target &tgt)
+FS::Path Install::generate_target_path(const FileTarget &tgt)
 {
        const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(tgt.get_package());
 
        FS::Path base=spkg->get_builder().get_prefix();
-       string tgtname=tgt.get_name().substr(tgt.get_name().rfind('/')+1);
+       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();
-       else if(const Executable *exe=dynamic_cast<const Executable *>(&tgt))
+       else if(dynamic_cast<const Executable *>(&tgt))
+               mid="bin";
+       else if(const SharedLibrary *shlib=dynamic_cast<const SharedLibrary *>(&tgt))
        {
-               const Component &comp=exe->get_component();
+               const Component &comp=shlib->get_component();
                if(comp.get_type()==Component::LIBRARY)
                        mid="lib";
-               else if(comp.get_type()==Component::PROGRAM)
-                       mid="bin";
                else if(comp.get_type()==Component::MODULE)
                        mid="lib/"+tgt.get_package()->get_name();
        }