Add a feature for overlay source directories

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 5104cdf3e92b04c8567304baae993bf974f9952c..566cf8896b3988553b9457be1996a455d252d064 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -7,7 +7,7 @@
 #include "builder.h"
 #include "component.h"
 #include "csourcefile.h"
-#include "datafile.h"
+#include "datapack.h"
 #include "executable.h"
 #include "file.h"
 #include "objectfile.h"
@@ -101,6 +101,32 @@ void Component::create_build_info()
        }
 }
 
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
+{
+       // XXX Cache these and check that the directories actually exist before adding them
+       BuildInfo binfo = build_info;
+       if(!overlays.empty())
+       {
+               FS::Path dir = FS::dirname(path);
+               string last = FS::basename(dir);
+               for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
+                       if(last==*i)
+                       {
+                               dir = FS::dirname(dir);
+                               break;
+                       }
+
+               for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+                       if(dir==*i)
+                       {
+                               binfo.local_incpath.push_back(dir);
+                               for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                                       binfo.local_incpath.push_back(*i/ *j);
+                       }
+       }
+       return binfo;
+}
+
 void Component::create_targets() const
 {
        Builder &builder = package.get_builder();
@@ -156,16 +182,26 @@ void Component::create_targets() const
                        inst->add_dependency(*copy.create_target(*ft, name));
                }
        }
-       else if(type==DATAFILE)
+       else if(type==DATAPACK)
        {
                const Tool &dcomp = toolchain.get_tool("DATA");
 
-               File *source;
-               if(Target *tgt = builder.get_vfs().get_target(source_filenames.front()))
-                       source = dynamic_cast<File *>(tgt);
-               else
-                       source = new File(builder, package, source_filenames.front());
-               Target *result = dcomp.create_target(*source);
+               list<Target *> files;
+               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+               {
+                       string ext = FS::extpart(FS::basename(*i));
+                       if(ext==".mdt")
+                       {
+                               Target *src = dcomp.create_source(*this, *i);
+                               files.push_back(dcomp.create_target(*src, "collection"));
+                       }
+                       else if(Target *tgt = builder.get_vfs().get_target(*i))
+                               files.push_back(tgt);
+                       else
+                               files.push_back(new File(builder, package, *i));
+               }
+
+               Target *result = dcomp.create_target(files, "pack");
 
                build_graph.add_primary_target(*result);
                if(install)
@@ -227,13 +263,32 @@ Component::SourceList Component::collect_source_files() const
                FS::Path path(*i);
                if(FS::is_dir(path))
                {
-                       package.get_builder().get_logger().log("files", format("Traversing %s", path));
-                       list<string> sfiles = list_files(path);
-                       for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-                               files.push_back(path / *j);
+                       SourceList dirs;
+                       dirs.push_back(path);
+                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       {
+                               FS::Path opath = path / *j;
+                               if(FS::is_dir(opath))
+                                       dirs.push_back(opath);
+                       }
+                       for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+                       {
+                               package.get_builder().get_logger().log("files", format("Traversing %s", *j));
+                               list<string> sfiles = list_files(*j);
+                               for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+                                       files.push_back(*j / *k);
+                       }
                }
                else
+               {
                        files.push_back(path);
+                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       {
+                               FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+                               if(FS::is_reg(opath))
+                                       files.push_back(opath);
+                       }
+               }
        }
 
        return files;
@@ -245,6 +300,7 @@ Component::Loader::Loader(Component &c):
 {
        add("if_arch",         &Loader::if_arch);
        add("if_feature",      &Loader::if_feature);
+       add("overlay",         &Loader::overlay);
        add("source",          &Loader::source);
        add("install",         &Component::install);
        add("install_map",     &Loader::install_map);
@@ -254,6 +310,11 @@ Component::Loader::Loader(Component &c):
        add("use",             &Loader::use);
 }
 
+void Component::Loader::build_info()
+{
+       load_sub(obj.build_info);
+}
+
 void Component::Loader::if_arch(const string &cond)
 {
        bool match = obj.package.get_builder().get_current_arch().match_name(cond);
@@ -272,9 +333,14 @@ void Component::Loader::if_feature(const string &cond)
                load_sub_with(*this);
 }
 
-void Component::Loader::source(const string &s)
+void Component::Loader::install_map()
 {
-       obj.sources.push_back((obj.package.get_source_directory()/s).str());
+       load_sub(obj.install_map, obj.package.get_source_directory());
+}
+
+void Component::Loader::overlay(const string &o)
+{
+       obj.overlays.push_back(o);
 }
 
 void Component::Loader::require(const string &n)
@@ -284,14 +350,9 @@ void Component::Loader::require(const string &n)
                obj.requires.push_back(req);
 }
 
-void Component::Loader::build_info()
-{
-       load_sub(obj.build_info);
-}
-
-void Component::Loader::install_map()
+void Component::Loader::source(const string &s)
 {
-       load_sub(obj.install_map, obj.package.get_source_directory());
+       obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }
 
 void Component::Loader::use(const string &n)