using namespace std;
using namespace Msp;
-FileTarget::FileTarget(Builder &b, const FS::Path &a):
- Target(b, generate_name(b, 0, a)),
+FileTarget::FileTarget(Builder &b, const SourcePackage *p, const FS::Path &a):
+ Target(b, generate_name(b, p, a)),
path(a)
{
- init(0);
-}
-
-FileTarget::FileTarget(Builder &b, const SourcePackage &p, const FS::Path &a):
- Target(b, generate_name(b, &p, a)),
- path(a)
-{
- init(&p);
-}
-
-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);
return string();
const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
- list<string> sigs;
+ 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)
{
- set<const Tool *> depend_tools;
+ vector<const Tool *> seen_tools;
+ vector<string> tool_sigs;
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));
+ 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()));
}
- 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(), ";");
}