Reimplement datafile building

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 5104cdf3e92b04c8567304baae993bf974f9952c..3b1f872ae92292529b845ab09e9b7b112763fa4f 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"
@@ -156,16 +156,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)
@@ -254,6 +264,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 +287,9 @@ 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::require(const string &n)
@@ -284,14 +299,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)