X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=5ed3139cd38d5d9fdd407dafb5813e1b3d7cd896;hb=dc4b917034c9d3718f07139e2f0f3631a080c6f3;hp=2a96066c9202e6deadcc5addfa842fe7b0783308;hpb=8fa75f16e653e22f188bc09c5d04c3cdb5cf8c52;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 2a96066..5ed3139 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -3,7 +3,6 @@
 #include "copy.h"
 #include "executable.h"
 #include "datafile.h"
-#include "header.h"
 #include "installedfile.h"
 #include "package.h"
 #include "pkgconfig.h"
@@ -14,10 +13,9 @@ using namespace std;
 using namespace Msp;
 
 InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc):
-	FileTarget(b, &p, generate_target_path(s, loc)),
+	FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
 	source(s)
 {
-	buildable = true;
 	add_depend(&source);
 
 	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
@@ -39,50 +37,20 @@ void InstalledFile::check_rebuild()
 		mark_rebuild("Does not exist");
 	else if(source.get_mtime()>mtime || source.get_size()!=size)
 		mark_rebuild(source.get_name()+" has changed");
-	else if(source.get_rebuild())
+	else if(source.needs_rebuild())
 		mark_rebuild(source.get_name()+" needs rebuilding");
 }
 
-FS::Path InstalledFile::generate_target_path(const FileTarget &tgt, const std::string &loc)
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc)
 {
-	if(!tgt.get_package())
-		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());
+	if(!tgt.is_installable() && loc.empty())
+		throw invalid_argument(tgt.get_name()+" is not installable");
 
 	string mid;
 	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 = 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();
-	}
-	else if(dynamic_cast<const StaticLibrary *>(&tgt))
-		mid = "lib";
-	else if(dynamic_cast<const PkgConfig *>(&tgt))
-		mid = "lib/pkgconfig";
-	else if(dynamic_cast<const ::DataFile *>(&tgt))
-		mid = "share/"+tgt.get_package()->get_name();
-
-	if(mid.empty())
-		throw invalid_argument("Don't know where to install "+tgtname);
+	else
+		mid = tgt.get_install_location();
 
-	return base/mid/tgtname;
+	return prefix/mid/FS::basename(tgt.get_path());
 }