Redesign the way commands are set for tools

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index af63c237a2a0e849b8fe403bb0edb2ed3a772425..862ddbe5836197c500ae99cf05f324c419bacbe5 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -70,7 +70,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-       if(!tool)
+       if(!tool || needs_rebuild())
                return;
 
        if(!mtime)
@@ -89,12 +89,10 @@ void FileTarget::check_rebuild()
 
        if(!needs_rebuild())
        {
+               // Some side effects might not exist
                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((*i)->needs_rebuild())
+                               mark_rebuild((*i)->get_name()+" needs rebuilding");
        }
 
        if(!needs_rebuild() && package)
@@ -102,11 +100,14 @@ void FileTarget::check_rebuild()
                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");
+                       }
                }
        }
 }
@@ -120,12 +121,10 @@ string FileTarget::create_build_signature() const
        return tool->create_build_signature(binfo);
 }
 
-Task *FileTarget::build()
+void FileTarget::build(Task &task)
 {
-       Task *task = Target::build();
-       task->set_file(path);
-       task->set_unlink(true);
-       return task;
+       task.add_file(path);
+       task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)