X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=af63c237a2a0e849b8fe403bb0edb2ed3a772425;hb=82ae60a647ebb9567f7177c353245f4d72faaf5e;hp=1f25cd1a9818a283c9e74ba4705d3df2dafd9faa;hpb=03227882aef8b448065e6ca9cda9b7722b7a9753;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 1f25cd1..af63c23 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -6,6 +6,7 @@
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "task.h"
 #include "tool.h"
 
 using namespace std;
@@ -54,7 +55,6 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 	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);
 	}
 
@@ -64,6 +64,7 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 void FileTarget::touch()
 {
 	mtime = Time::now();
+	modified();
 	signal_bubble_rebuild.emit();
 }
 
@@ -86,6 +87,16 @@ void FileTarget::check_rebuild()
 		}
 	}
 
+	if(!needs_rebuild())
+	{
+		for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
+		{
+			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+			if(ft && !ft->get_mtime())
+				mark_rebuild((*i)->get_name()+" does not exist");
+		}
+	}
+
 	if(!needs_rebuild() && package)
 	{
 		if(package->get_config().get_mtime()>mtime)
@@ -111,10 +122,10 @@ string FileTarget::create_build_signature() const
 
 Task *FileTarget::build()
 {
-	if(tool && !builder.get_dry_run() && mtime)
-		FS::unlink(path);
-
-	return Target::build();
+	Task *task = Target::build();
+	task->set_file(path);
+	task->set_unlink(true);
+	return task;
 }
 
 void FileTarget::build_finished(bool success)
@@ -132,3 +143,14 @@ void FileTarget::build_finished(bool success)
 
 	Target::build_finished(success);
 }
+
+void FileTarget::clean()
+{
+	if(mtime)
+	{
+		FS::unlink(path);
+		mtime = Time::TimeStamp();
+		size = 0;
+		check_rebuild();
+	}
+}