]> git.tdb.fi Git - builder.git/blobdiff - source/component.cpp
Add install component type
[builder.git] / source / component.cpp
index 6bef63651d9ec88f42fbe639010bc9a7935cc73b..de42d922404f995a186e80a6e62c5819faa59746 100644 (file)
@@ -14,12 +14,14 @@ Distributed under the LGPL
 #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;
@@ -87,68 +89,108 @@ void Component::create_targets() const
        Target *def_tgt=builder.get_target("default");
 
        PathList files=collect_source_files();
+       list<FileTarget *> inst_list;
 
-       bool build_exe=(type!=HEADERS);
-
-       list<ObjectFile *> objs;
-       list<FileTarget *> inst_tgts;
-       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+       string inst_loc;
+       if(type==TARBALL)
        {
-               string ext=FS::extpart(FS::basename(*i));
-               if((ext==".cpp" || ext==".c") && build_exe)
-               {
-                       SourceFile *src=new SourceFile(builder, this, i->str());
+               string tarname=name;
+               if(name=="@src")
+                       tarname=pkg.get_name()+"-"+pkg.get_version();
+               TarBall *result=new TarBall(builder, pkg, tarname);
 
-                       // Compile sources
-                       ObjectFile *obj=new ObjectFile(builder, *this, *src);
-                       objs.push_back(obj);
+               if(name=="@src")
+               {
+                       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->is_buildable())
+                                       result->add_depend(i->second);
+                       files.push_back(pkg.get_source()/"Build");
                }
-               else if(ext==".h")
+
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
-                       if(!hdr)
-                               hdr=new Header(builder, this, i->str());
+                       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);
+               }
 
-                       // Install headers if requested
-                       if(type==HEADERS && install)
-                               inst_tgts.push_back(hdr);
+               Target *tarbls_tgt=builder.get_target("tarballs");
+               tarbls_tgt->add_depend(result);
+
+               return;
+       }
+       else if(type==INSTALL)
+       {
+               inst_loc=name;
+               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, pkg, *i);
+                       inst_list.push_back(ft);
                }
        }
-
-       if(build_exe)
+       else
        {
-               Binary *bin=0;
-               StaticLibrary *slib=0;
-               if(type==LIBRARY)
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       bin=new SharedLibrary(builder, *this, objs);
-                       slib=new StaticLibrary(builder, *this, objs);
+                       string ext=FS::extpart(FS::basename(*i));
+                       if(ext==".h")
+                       {
+                               FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
+                               if(!hdr)
+                                       hdr=new Header(builder, *this, i->str());
+
+                               // Install headers if requested
+                               if(type==HEADERS && install)
+                                       inst_list.push_back(hdr);
+                       }
                }
-               else
-                       bin=new Executable(builder, *this, objs);
+       }
 
-               if(&pkg==builder.get_main_package() && deflt)
+       if(type==PROGRAM || type==LIBRARY || type==MODULE)
+       {
+               list<ObjectFile *> objs;
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       def_tgt->add_depend(bin);
-                       if(slib) def_tgt->add_depend(slib);
+                       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
+
+               list<FileTarget *> results;
+               if(type==LIBRARY)
                {
-                       world->add_depend(bin);
-                       if(slib) world->add_depend(slib);
+                       results.push_back(new SharedLibrary(builder, *this, objs));
+                       results.push_back(new StaticLibrary(builder, *this, objs));
                }
+               else
+                       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(bin);
-                       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(list<FileTarget *>::const_iterator i=inst_tgts.begin(); i!=inst_tgts.end(); ++i)
-               inst_tgt->add_depend(new Install(builder, pkg, **i));
+       for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
+               inst_tgt->add_depend(new Install(builder, pkg, **i, inst_loc));
 }
 
 PathList Component::collect_source_files() const
@@ -209,7 +251,7 @@ void Component::Loader::require(const string &n)
 void Component::Loader::modular()
 {
        if(comp.type!=PROGRAM)
-               throw Msp::Exception("Only programs can be modular");
+               throw Exception("Only programs can be modular");
        comp.modular=true;
 }
 
@@ -219,13 +261,13 @@ void Component::Loader::host(const string &n)
        for(ComponentList::const_iterator i=comps.begin(); i!=comps.end(); ++i)
                if(i->get_name()==n)
                {
-                       if(i->get_type()!=PROGRAM || !i->get_modular())
-                               throw Msp::Exception("Module host must be a modular program");
+                       if(i->get_type()!=PROGRAM || !i->is_modular())
+                               throw Exception("Module host must be a modular program");
                        comp.module_host=&*i;
                        return;
                }
 
-       throw Msp::Exception("Unknown component");
+       throw KeyError("Unknown component", n);
 }
 
 void Component::Loader::install_headers(const string &p)