Replace basic for loops with range-based loops or algorithms

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 3d8014755de2b90dd2c81ff528f2e91029ca5278..493f0203ee4f155a6e31a5e821a1a1a72c510c35 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -6,6 +7,7 @@
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "task.h"
 #include "tool.h"
 
 using namespace std;
@@ -29,6 +31,8 @@ void FileTarget::init(const SourcePackage *p)
 {
        size = 0;
        package = p;
+       nested_build_sig = false;
+       arch_in_build_sig = false;
 
        builder.get_vfs().register_path(path, this);
 
@@ -63,38 +67,52 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 void FileTarget::touch()
 {
        mtime = Time::now();
+       modified();
        signal_bubble_rebuild.emit();
 }
 
 void FileTarget::check_rebuild()
 {
-       if(!tool)
+       if(!tool || needs_rebuild())
                return;
 
        if(!mtime)
                mark_rebuild("Does not exist");
        else
        {
-               for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
+               for(Target *d: depends)
                {
-                       FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+                       FileTarget *ft = dynamic_cast<FileTarget *>(d);
                        if(ft && ft->get_mtime()>mtime)
-                               mark_rebuild((*i)->get_name()+" has changed");
-                       else if((*i)->needs_rebuild())
-                               mark_rebuild((*i)->get_name()+" needs rebuilding");
+                               mark_rebuild(d->get_name()+" has changed");
+                       else if(d->needs_rebuild())
+                               mark_rebuild(d->get_name()+" needs rebuilding");
+                       if(needs_rebuild())
+                               break;
                }
        }
 
+       if(!needs_rebuild())
+       {
+               // Some side effects might not exist
+               auto i = find_if(side_effects, [](const Target *s){ return s->needs_rebuild(); });
+               if(i!=side_effects.end())
+                       mark_rebuild((*i)->get_name()+" needs rebuilding");
+       }
+
        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");
+                       }
                }
        }
 }
@@ -105,15 +123,33 @@ string FileTarget::create_build_signature() const
                return string();
 
        const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
-       return tool->create_build_signature(binfo);
+       list<string> sigs;
+       if(nested_build_sig && component)
+       {
+               set<const Tool *> depend_tools;
+               for(Target *d: depends)
+                       if(d->get_component()==component && d->get_tool())
+                               depend_tools.insert(d->get_tool());
+
+               for(const Tool *t: depend_tools)
+                       sigs.push_back(t->create_build_signature(binfo));
+               sigs.sort();
+               sigs.push_front(tool->create_build_signature(binfo));
+       }
+       else
+               sigs.push_back(tool->create_build_signature(binfo));
+
+       if(arch_in_build_sig)
+               if(const Architecture *arch = tool->get_architecture())
+                       sigs.push_front(arch->get_name());
+
+       return join(sigs.begin(), sigs.end(), ";");
 }
 
-Task *FileTarget::build()
+void FileTarget::build(Task &task)
 {
-       if(tool && !builder.get_dry_run() && mtime)
-               FS::unlink(path);
-
-       return Target::build();
+       task.add_file(path);
+       task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)