Don't append library version to the end of the filename on Windows

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 1f25cd1a9818a283c9e74ba4705d3df2dafd9faa..ec89be897721d063bf2fe5fa82a8498ef265f681 100644 (file)
--- 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();
 }
 
@@ -111,10 +112,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 +133,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();
+       }
+}