+#include <msp/core/algorithm.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/strings/format.h>
{
size = 0;
package = p;
+ nested_build_sig = false;
+ arch_in_build_sig = false;
builder.get_vfs().register_path(path, this);
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
- for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
- if((*i)->needs_rebuild())
- mark_rebuild((*i)->get_name()+" needs rebuilding");
+ 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)
return string();
const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
- return tool->create_build_signature(binfo);
+ vector<string> sigs;
+
+ if(arch_in_build_sig)
+ if(const Architecture *arch = tool->get_architecture())
+ sigs.push_back(arch->get_name());
+
+ sigs.push_back(tool->create_build_signature(binfo));
+
+ if(nested_build_sig && component)
+ {
+ vector<const Tool *> seen_tools;
+ vector<string> tool_sigs;
+ for(Target *d: depends)
+ if(const Tool *t = d->get_tool())
+ if(d->get_component()==component && !any_equals(seen_tools, t))
+ {
+ seen_tools.push_back(t);
+ tool_sigs.push_back(t->create_build_signature(binfo));
+ }
+
+ sort(tool_sigs);
+ sigs.insert(sigs.end(), make_move_iterator(tool_sigs.begin()), make_move_iterator(tool_sigs.end()));
+ }
+
+ return join(sigs.begin(), sigs.end(), ";");
}
void FileTarget::build(Task &task)