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

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 1750a15..a71bcba 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)),
+InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &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))
@@ -28,6 +20,20 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 		builder.get_vfs().register_path(link, this);
 }
 
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
+{
+	if(!tgt.is_installable() && loc.empty())
+		throw invalid_argument(tgt.get_name()+" is not installable");
+
+	FS::Path mid;
+	if(!loc.empty())
+		mid = loc;
+	else
+		mid = tgt.get_install_location();
+
+	return prefix/mid/FS::basename(tgt.get_path());
+}
+
 Target *InstalledFile::get_real_target()
 {
 	return source.get_real_target();
@@ -39,26 +45,6 @@ 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)
-{
-	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());
-
-	string mid;
-	if(!loc.empty())
-		mid = loc;
-	else
-		mid = tgt.get_install_location();
-
-	if(mid.empty())
-		throw invalid_argument("Don't know where to install "+tgtname);
-
-	return base/mid/tgtname;
-}