Resolve cmdline targets and what-ifs the same way

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 58e1a7b575fc8cc64306c3ecbaea27b4a688aaca..b42580a099a0a95eb411bc34fa65345cd72a2b03 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;
@@ -63,6 +64,7 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 void FileTarget::touch()
 {
        mtime = Time::now();
+       modified();
        signal_bubble_rebuild.emit();
 }
 
@@ -85,16 +87,29 @@ 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)
                        mark_rebuild("Package options changed");
 
-               string build_sig = create_build_signature();
-               if(package->get_cache().has_key(this, "build_sig"))
+               if(tool->get_executable())
                {
-                       if(package->get_cache().get_value(this, "build_sig")!=build_sig)
-                               mark_rebuild("Build signature changed");
+                       string build_sig = create_build_signature();
+                       if(package->get_cache().has_key(this, "build_sig"))
+                       {
+                               if(package->get_cache().get_value(this, "build_sig")!=build_sig)
+                                       mark_rebuild("Build signature changed");
+                       }
                }
        }
 }
@@ -110,10 +125,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)
@@ -131,3 +146,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();
+       }
+}