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

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 1750a15..6e45ad2 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,31 +1,61 @@
+#include <msp/fs/stat.h>
 #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);
+	add_dependency(source);
+}
+
+FS::Path InstalledFile::generate_target_path(const FS::Path &global_prefix, const FileTarget &tgt, const string &loc)
+{
+	if(!tgt.is_installable() && loc.empty())
+		throw invalid_argument(tgt.get_name()+" is not installable");
+
+	FS::Path prefix;
+	FS::Path mid;
+	if(!loc.compare(0, 2, "//"))
+	{
+		if(!tgt.get_package())
+			throw invalid_argument("No private install location for "+tgt.get_name());
+
+		prefix = tgt.get_package()->get_temp_directory();
+		mid = loc.substr(2);
+	}
+	else
+	{
+		prefix = global_prefix;
+
+		if(!loc.empty())
+			mid = loc;
+		else if(const Component *comp = tgt.get_component())
+			mid = comp->get_install_map().get_install_location(tgt);
+	}
+
+	if(mid.empty())
+		mid = tgt.get_install_location();
 
-	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
-		if(!shlib->get_soname().empty())
-			link = FS::dirname(path)/FS::basename(shlib->get_path());
+	string fn = tgt.get_install_filename();
+	if(fn.empty())
+		fn = FS::basename(tgt.get_path());
 
-	if(!link.empty())
-		builder.get_vfs().register_path(link, this);
+	return prefix/mid/fn;
+}
+
+void InstalledFile::set_symlink(const FS::Path &l)
+{
+	FS::Path al = FS::dirname(path)/l;
+	if(al==path)
+		throw invalid_argument("InstalledFile::set_symlink");
+	link = FS::dirname(path)/l;
+	builder.get_vfs().register_path(link, this);
 }
 
 Target *InstalledFile::get_real_target()
@@ -39,26 +69,24 @@ 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");
+	if(!needs_rebuild() && !link.empty())
+	{
+		if(!FS::exists(link))
+			mark_rebuild("Symlink does not exist");
+		else
+		{
+			FS::Path rel_path = FS::relative(path, FS::dirname(link));
+			if(FS::readlink(link)!=rel_path)
+				mark_rebuild("Symlink needs updating");
+		}
+	}
 }
 
-FS::Path InstalledFile::generate_target_path(const FileTarget &tgt, const std::string &loc)
+void InstalledFile::clean()
 {
-	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;
+	if(!link.empty() && mtime)
+		FS::unlink(link);
+	FileTarget::clean();
 }