-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <algorithm>
#include <msp/fs/utils.h>
#include "builder.h"
using namespace Msp;
ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
- FileTarget(b, &c.get_package(), generate_target_path(c, FS::basename(s.get_path()))),
+ FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
comp(c),
source(s)
{
- buildable=true;
+ buildable = true;
add_depend(&source);
}
{
for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
{
- Target *tgt=*i;
+ Target *tgt = *i;
if(tgt->get_depends_ready())
{
- i=new_deps.erase(i);
+ i = new_deps.erase(i);
find_depends(tgt);
}
else
++i;
}
- deps_ready=new_deps.empty();
+ deps_ready = new_deps.empty();
}
void ObjectFile::find_depends(Target *tgt)
{
- SourceFile *src=dynamic_cast<SourceFile *>(tgt);
- FileTarget *file=src;
- if(!src)
- {
- if(Install *inst=dynamic_cast<Install *>(tgt))
- {
- file=inst;
- src=dynamic_cast<SourceFile *>(&inst->get_source());
- }
- }
- if(!src)
+ SourceFile *src = dynamic_cast<SourceFile *>(tgt->get_real_target());
+ FileTarget *file = dynamic_cast<FileTarget *>(tgt);
+ if(!src || !file)
return;
- FS::Path spath=FS::dirname(file->get_path());
- const StringList &incpath=comp.get_build_info().incpath;
+ FS::Path spath = FS::dirname(file->get_path());
+ const StringList &incpath = comp.get_build_info().incpath;
- const list<string> &includes=src->get_includes();
+ 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, spath, incpath);
- if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
- add_depend(hdr2);
+ Target *hdr = builder.get_header(*i, spath, incpath);
+ if(hdr && find(depends.begin(), depends.end(), hdr)==depends.end())
+ add_depend(hdr);
}
}
FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
{
- const SourcePackage &pkg=comp.get_package();
- return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(src)+".o");
+ const SourcePackage &pkg = comp.get_package();
+ string fn = FS::basepart(src)+".o";
+ if(!fn.compare(0, 2, "./"))
+ fn.erase(0, 2);
+ for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
+ if(*i=='/')
+ *i = '_';
+ return pkg.get_temp_dir()/comp.get_name()/fn;
}