X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=9908c0d4d2836c36c5e05e1eda9aa221bab067b2;hb=30b1243ff16b908ae18b4ab9d70f772c9196b949;hp=054be8143dec5c090098c0bff0405aba42168bf4;hpb=f8961a9113477735724a3a5229b9338bc9c0fe2e;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 054be81..9908c0d 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -9,11 +9,25 @@
 using namespace std;
 using namespace Msp;
 
-FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
-	Target(b, p, make_name(p, a)),
-	path(a),
-	size(0)
+FileTarget::FileTarget(Builder &b, const FS::Path &a):
+	Target(b, generate_name(b, 0, a)),
+	path(a)
 {
+	init(0);
+}
+
+FileTarget::FileTarget(Builder &b, const SourcePackage &p, const FS::Path &a):
+	Target(b, generate_name(b, &p, a)),
+	path(a)
+{
+	init(&p);
+}
+
+void FileTarget::init(const SourcePackage *p)
+{
+	size = 0;
+	package = p;
+
 	builder.get_vfs().register_path(path, this);
 
 	if(FS::Stat st = FS::lstat(path))
@@ -23,9 +37,27 @@ FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
 	}
 }
 
+string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, const FS::Path &path)
+{
+	if(pkg && FS::descendant_depth(path, pkg->get_source())>=0)
+	{
+		FS::Path relpath = FS::relative(path, pkg->get_source());
+		return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+	}
+	else if(FS::descendant_depth(path, builder.get_prefix())>=0)
+	{
+		FS::Path relpath = FS::relative(path, builder.get_prefix());
+		builder.get_logger().log("debug", format("%s %s %s", path, builder.get_prefix(), relpath));
+		return "<prefix>"+relpath.str().substr(1);
+	}
+
+	return path.str();
+}
+
 void FileTarget::touch()
 {
 	mtime = Time::now();
+	signal_bubble_rebuild.emit();
 }
 
 void FileTarget::check_rebuild()
@@ -33,48 +65,28 @@ void FileTarget::check_rebuild()
 	if(!tool)
 		return;
 
-	if(builder.get_build_all())
-		mark_rebuild("Rebuilding everything");
-	else if(!mtime)
+	if(!mtime)
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
 		{
 			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
 			if(ft && ft->get_mtime()>mtime)
 				mark_rebuild((*i)->get_name()+" has changed");
-			else if((*i)->get_rebuild())
+			else if((*i)->needs_rebuild())
 				mark_rebuild((*i)->get_name()+" needs rebuilding");
-			else
-			{
-				Target *real = ft->get_real_target();
-				if(real->get_rebuild())
-					mark_rebuild(real->get_name()+" needs rebuilding");
-			}
 		}
 	}
 
-	const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+	if(!needs_rebuild() && package && package->get_config().get_mtime()>mtime)
 		mark_rebuild("Package options changed");
 }
 
-string FileTarget::make_name(const Package *pkg, const FS::Path &pth)
+Task *FileTarget::build()
 {
-	if(const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(pkg))
-	{
-		if(FS::descendant_depth(pth, spkg->get_source())>=0)
-		{
-			FS::Path relpath = FS::relative(pth, spkg->get_source());
-			return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
-		}
-		else if(FS::descendant_depth(pth, pkg->get_builder().get_prefix())>=0)
-		{
-			FS::Path relpath = FS::relative(pth, pkg->get_builder().get_prefix());
-			return "<prefix>"+relpath.str().substr(1);
-		}
-	}
+	if(tool && !builder.get_dry_run() && mtime)
+		FS::unlink(path);
 
-	return pth.str();
+	return Target::build();
 }