More flexible way to manage filename patterns

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 7aafe90d68c1412594a086b998cb828d78605269..1e6cb232135ca489aeeacd2045d86168394b0098 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -10,38 +10,59 @@ using namespace std;
 using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
-       FileTarget(b, c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
-       source(s)       
+       FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
+       source(s),
+       used_in_shlib(false)
 {
        component = &c;
-       add_depend(source);
+       add_dependency(source);
 }
 
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
        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;
+       FS::Path temp_dir = pkg.get_temp_directory()/comp.get_name();
+       FS::Path rel_src;
+       if(FS::descendant_depth(src, temp_dir)>=0)
+               rel_src = FS::relative(src, temp_dir);
+       else
+               rel_src = FS::relative(src, pkg.get_source_directory());
+       string fn;
+       for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
+       {
+               if(!fn.empty())
+                       fn += '_';
+               if(*i!=".")
+                       fn += *i;
+       }
+       const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+       return temp_dir/arch.create_filename<ObjectFile>(FS::basepart(fn));
+}
+
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+       used_in_shlib = u;
 }
 
-void ObjectFile::find_depends()
+void ObjectFile::collect_build_info(BuildInfo &binfo) const
+{
+       Target::collect_build_info(binfo);
+       binfo.update_from(component->get_build_info_for_path(source.get_path()));
+}
+
+void ObjectFile::find_dependencies()
 {
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                (*i)->prepare();
-               find_depends(dynamic_cast<FileTarget *>(*i));
+               find_dependencies(dynamic_cast<FileTarget *>(*i));
        }
 }
 
-void ObjectFile::find_depends(FileTarget *tgt)
+void ObjectFile::find_dependencies(FileTarget *tgt)
 {
        FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
-       const Dependencies &tdeps = rtgt->get_depends();
+       const Dependencies &tdeps = rtgt->get_transitive_dependencies();
        Dependencies deps_to_add;
        if(rtgt==tgt)
        {
@@ -51,17 +72,32 @@ void ObjectFile::find_depends(FileTarget *tgt)
        }
        else
        {
+               FS::Path inst_dir = rtgt->get_component()->get_install_map().get_install_location(*rtgt);
                /* The target has been displaced by installing it.  Displace any
                dependencies that come from the same package as well. */
                const SourcePackage *tpkg = rtgt->get_package();
                for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
                {
                        FileTarget *file = dynamic_cast<FileTarget *>(*i);
-                       if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source())>=0)
+                       if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
                        {
-                               FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
+                               const Component *tcomp = file->get_component();
+                               FS::Path dep_inst = tcomp->get_install_map().get_install_location(*file);
+                               FS::Path displaced = FS::dirname(tgt->get_path())/FS::relative(dep_inst, inst_dir)/FS::basename(file->get_path());
                                if(Target *ddep = builder.get_vfs().get_target(displaced))
                                        deps_to_add.push_back(ddep);
+                               else
+                               {
+                                       const Component::OverlayList &overlays = tcomp->get_overlays();
+                                       string last_dir = FS::basename(FS::dirname(displaced));
+                                       for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                                               if(last_dir==*j)
+                                               {
+                                                       displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
+                                                       if((ddep = builder.get_vfs().get_target(displaced)))
+                                                               deps_to_add.push_back(ddep);
+                                               }
+                               }
                        }
                        else
                                deps_to_add.push_back(*i);
@@ -70,5 +106,9 @@ void ObjectFile::find_depends(FileTarget *tgt)
 
        for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
                if(find(depends.begin(), depends.end(), *i)==depends.end())
-                       add_depend(**i);
+               {
+                       add_dependency(**i);
+                       if((*i)->get_real_target()->is_buildable())
+                               (*i)->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
+               }
 }