+#include <msp/algo.h>
#include <msp/path/utils.h>
#include "builder.h"
#include "compile.h"
void ObjectFile::find_depends()
{
- find_depends(depends.front());
+ for(list<Target *>::iterator i=new_deps.begin(); i!=new_deps.end();)
+ {
+ Target *tgt=*i;
+ if(tgt->get_depends_ready())
+ {
+ i=new_deps.erase(i);
+ find_depends(tgt);
+ }
+ else
+ ++i;
+ }
+
+ deps_ready=new_deps.empty();
}
Action *ObjectFile::build()
void ObjectFile::find_depends(Target *tgt)
{
+ const string &tname=tgt->get_name();
+ string path=tname.substr(0, tname.rfind('/'));
+
SourceFile *src=dynamic_cast<SourceFile *>(tgt);
if(!src)
{
if(!src)
return;
- const string &sname=src->get_name();
- string path=sname.substr(0, sname.rfind('/'));
-
const list<string> &includes=src->get_includes();
for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
{
- Target *hdr2=builder.get_header(*i, path, package->get_build_info().incpath);
- if(hdr2)
+ Target *hdr2=builder.get_header(*i, path, comp.get_build_info().incpath);
+ if(hdr2 && !contains(depends, hdr2))
add_depend(hdr2);
}
}
+void ObjectFile::add_depend(Target *tgt)
+{
+ Target::add_depend(tgt);
+ new_deps.push_back(tgt);
+}
+
string ObjectFile::generate_target_name(const Component &comp, const string &src)
{
return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();