Add a tarball component type

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index dcbaf373e19c0c16360fbfa468988575767fd5ff..cb81f8420429b78bd79b4d3f70c6021db04e4e81 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -9,15 +9,19 @@ Distributed under the LGPL
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
+#include "executable.h"
+#include "file.h"
 #include "header.h"
 #include "install.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tarball.h"
 #include "target.h"
 
 using namespace std;
@@ -86,66 +90,90 @@ void Component::create_targets() const
 
        PathList files=collect_source_files();
 
-       bool build_exe=(type!=HEADERS);
-
-       list<ObjectFile *> objs;
-       list<Target *> inst_tgts;
-       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+       if(type==TARBALL)
        {
-               string ext=FS::extpart(FS::basename(*i));
-               if((ext==".cpp" || ext==".c") && build_exe)
+               string tarname=name;
+               if(name=="@src")
+                       tarname=pkg.get_name()+"-"+pkg.get_version();
+               TarBall *result=new TarBall(builder, pkg, tarname);
+
+               if(name=="@src")
                {
-                       SourceFile *src=new SourceFile(builder, this, i->str());
+                       const TargetMap &targets=builder.get_targets();
+                       for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+                               if(i->second->get_package()==&pkg && !i->second->get_buildable())
+                                       result->add_depend(i->second);
+                       files.push_back(pkg.get_source()/"Build");
+               }
 
-                       // Compile sources
-                       ObjectFile *obj=new ObjectFile(builder, *this, *src);
-                       objs.push_back(obj);
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+               {
+                       FileTarget *ft;
+                       if(Target *tgt=builder.get_target(i->str()))
+                               ft=dynamic_cast<FileTarget *>(tgt);
+                       else
+                               ft=new File(builder, *i);
+                       result->add_depend(ft);
                }
-               else if(ext==".h")
+
+               Target *tarbls_tgt=builder.get_target("tarballs");
+               tarbls_tgt->add_depend(result);
+
+               return;
+       }
+
+       list<FileTarget *> inst_list;
+       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+       {
+               string ext=FS::extpart(FS::basename(*i));
+               if(ext==".h")
                {
-                       Target *hdr=builder.get_target(i->str());
+                       FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
                        if(!hdr)
                                hdr=new Header(builder, this, i->str());
 
                        // Install headers if requested
-                       if(!install_headers.empty())
-                               inst_tgts.push_back(hdr);
+                       if(type==HEADERS && install)
+                               inst_list.push_back(hdr);
                }
        }
 
-       if(build_exe)
+       if(type==PROGRAM || type==LIBRARY || type==MODULE)
        {
-               Executable *exe=0;
-               StaticLibrary *slib=0;
-               if(type==LIBRARY)
+               list<ObjectFile *> objs;
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       exe=new SharedLibrary(builder, *this, objs);
-                       slib=new StaticLibrary(builder, *this, objs);
+                       string ext=FS::extpart(FS::basename(*i));
+                       if((ext==".cpp" || ext==".cc" || ext==".c"))
+                       {
+                               SourceFile *src=new SourceFile(builder, this, i->str());
+                               ObjectFile *obj=new ObjectFile(builder, *this, *src);
+                               objs.push_back(obj);
+                       }
                }
-               else
-                       exe=new Executable(builder, *this, objs);
 
-               if(&pkg==builder.get_main_package() && deflt)
+               list<FileTarget *> results;
+               if(type==LIBRARY)
                {
-                       def_tgt->add_depend(exe);
-                       if(slib) def_tgt->add_depend(slib);
+                       results.push_back(new SharedLibrary(builder, *this, objs));
+                       results.push_back(new StaticLibrary(builder, *this, objs));
                }
                else
-               {
-                       world->add_depend(exe);
-                       if(slib) world->add_depend(slib);
-               }
+                       results.push_back(new Executable(builder, *this, objs));
 
-               if(install)
+               for(list<FileTarget *>::const_iterator i=results.begin(); i!=results.end(); ++i)
                {
-                       inst_tgts.push_back(exe);
-                       if(slib)
-                               inst_tgts.push_back(slib);
+                       if(&pkg==builder.get_main_package() && deflt)
+                               def_tgt->add_depend(*i);
+                       else
+                               world->add_depend(*i);
+                       if(install)
+                               inst_list.push_back(*i);
                }
        }
 
        Target *inst_tgt=builder.get_target("install");
-       for(TargetList::const_iterator i=inst_tgts.begin(); i!=inst_tgts.end(); ++i)
+       for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
                inst_tgt->add_depend(new Install(builder, pkg, **i));
 }
 
@@ -173,7 +201,7 @@ Component::Loader::Loader(Component &c):
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
-       add("install_headers", &Component::install_headers);
+       add("install_headers", &Loader::install_headers);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("modular",         &Loader::modular);
@@ -181,6 +209,17 @@ Component::Loader::Loader(Component &c):
        add("default",         &Component::deflt);
 }
 
+void Component::Loader::finish()
+{
+       if(!inst_hdr.empty())
+       {
+               Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
+               hdrcomp.sources=comp.sources;
+               hdrcomp.install=true;
+               const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
+       }
+}
+
 void Component::Loader::source(const string &s)
 {
        comp.sources.push_back(comp.pkg.get_source()/s);
@@ -215,6 +254,18 @@ void Component::Loader::host(const string &n)
        throw Msp::Exception("Unknown component");
 }
 
+void Component::Loader::install_headers(const string &p)
+{
+       IO::print("%s: Note: install_headers is deprecated\n", get_source());
+       if(comp.type==HEADERS)
+       {
+               comp.name=p;
+               comp.install=true;
+       }
+       else
+               inst_hdr=p;
+}
+
 void Component::Loader::build_info()
 {
        load_sub(comp.build_info);