X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstall.cpp;h=6f6bca3432266ef1d4ee70950dea45f835aab946;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=2cdd1aa1a4a959c6f34f754a273a8b9ffbf5497b;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/install.cpp b/source/install.cpp
index 2cdd1aa..6f6bca3 100644
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -1,76 +1,86 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/path/utils.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "copy.h"
 #include "executable.h"
+#include "datafile.h"
 #include "header.h"
 #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, const std::string &loc):
+	FileTarget(b, &p, generate_target_path(s, loc)),
+	source(s)
+{
+	buildable = true;
+	add_depend(&source);
+}
+
+Target *Install::get_real_target()
 {
-	buildable=true;
-	add_depend(&tgt);
+	return source.get_real_target();
 }
 
 void Install::check_rebuild()
 {
 	if(!mtime)
 		mark_rebuild("Does not exist");
-	else
-	{
-		Target *dep=depends.front();
-		if(dep->get_mtime()>mtime)
-			mark_rebuild(Path::basename(dep->get_name())+" has changed");
-		else if(dep->get_rebuild())
-			mark_rebuild(Path::basename(dep->get_name())+" needs rebuilding");
-	}
+	else if(source.get_mtime()>mtime || source.get_size()!=size)
+		mark_rebuild(source.get_name()+" has changed");
+	else if(source.get_rebuild())
+		mark_rebuild(source.get_name()+" needs rebuilding");
 }
 
-Action *Install::build()
+Action *Install::create_action()
 {
-	return Target::build(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 std::string &loc)
 {
-	const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(tgt.get_package());
+	if(!tgt.get_package())
+		throw invalid_argument("Can't install package-less targets");
 
-	Path::Path base=spkg->get_prefix();
-	string tgtname=tgt.get_name().substr(tgt.get_name().rfind('/')+1);
+	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();
-	else if(const Executable *exe=dynamic_cast<const Executable *>(&tgt))
+	if(!loc.empty())
+		mid = loc;
+	else if(const Header *hdr = dynamic_cast<const Header *>(&tgt))
+	{
+		if(hdr->get_component()->get_type()!=Component::HEADERS)
+			throw logic_error("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))
 	{
-		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";
+		{
+			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();
+			mid = "lib/"+tgt.get_package()->get_name();
 	}
 	else if(dynamic_cast<const StaticLibrary *>(&tgt))
-		mid="lib";
+		mid = "lib";
 	else if(dynamic_cast<const PkgConfig *>(&tgt))
-		mid="lib/pkgconfig";
+		mid = "lib/pkgconfig";
+	else if(dynamic_cast<const ::DataFile *>(&tgt))
+		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();
 }