X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=04a40ece30fc3714309d27a3f150f1eae23b3f44;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=1750a15df6e97bcfc02a94da004666144d990644;hpb=172db6b81ecc2aa418729a6815b9134a685545fc;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 1750a15..04a40ec 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,23 +1,15 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
-#include "copy.h"
-#include "executable.h"
-#include "datafile.h"
-#include "header.h"
 #include "installedfile.h"
-#include "package.h"
-#include "pkgconfig.h"
 #include "sharedlibrary.h"
-#include "staticlibrary.h"
 
 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,17 +31,14 @@ 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())
@@ -57,8 +46,5 @@ FS::Path InstalledFile::generate_target_path(const FileTarget &tgt, const std::s
 	else
 		mid = tgt.get_install_location();
 
-	if(mid.empty())
-		throw invalid_argument("Don't know where to install "+tgtname);
-
-	return base/mid/tgtname;
+	return prefix/mid/FS::basename(tgt.get_path());
 }