]> git.tdb.fi Git - builder.git/blobdiff - source/component.cpp
Add install component type
[builder.git] / source / component.cpp
index b2ac62cc1b2a857a72c64bad3977e671a7f17c0d..de42d922404f995a186e80a6e62c5819faa59746 100644 (file)
@@ -1,19 +1,33 @@
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/core/except.h>
+#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 "package.h"
 #include "sharedlibrary.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tarball.h"
 #include "target.h"
 
 using namespace std;
 using namespace Msp;
 
-Component::Component(Package &p, Type t, const string &n):
+Component::Component(SourcePackage &p, Type t, const string &n):
        pkg(p),
        type(t),
        name(n),
@@ -23,28 +37,34 @@ Component::Component(Package &p, Type t, const string &n):
        deflt(true)
 { }
 
-/**
-Tries to resolve all references to packages.
-*/
-void Component::resolve_refs()
-{
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->resolve();
-}
-
-/**
-Prepares the build information for building.
-*/
 void Component::create_build_info()
 {
        build_info.add(pkg.get_build_info());
 
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               build_info.add((*i)->get_exported_binfo());
+
+       for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+               *i=(pkg.get_source() / *i).str();
+       for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+               *i=(pkg.get_source() / *i).str();
+
+       if(pkg.get_library_mode()!=DYNAMIC)
        {
-               if(!i->get_package())
-                       continue;
-               //i->get_package()->create_build_info();
-               build_info.add(i->get_package()->get_exported_binfo());
+               // XXX This may pull in some unnecessary libpaths too.  More thought required.
+               PackageList reqs=pkg.collect_requires();
+               for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i)
+               {
+                       const BuildInfo &ebi=(*i)->get_exported_binfo();
+                       build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
+               }
+       }
+
+       if(type==PROGRAM)
+       {
+               string strip=pkg.get_config().get_option("strip").value;
+               if(lexical_cast<bool>(strip))
+                       build_info.ldflags.push_back("-s");
        }
 
        if(modular)
@@ -62,9 +82,6 @@ void Component::create_build_info()
        build_info.unique();
 }
 
-/**
-Creates all targets needed for building this component.
-*/
 void Component::create_targets() const
 {
        Builder &builder=pkg.get_builder();
@@ -72,82 +89,116 @@ 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!=Component::HEADERS);
-
-       list<ObjectFile *> objs;
-       list<Target *> inst_tgts;
-       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+       string inst_loc;
+       if(type==TARBALL)
        {
-               string basename=(*i)[-1];
-               string ext=Path::splitext(basename).ext;
-               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")
+               {
+                       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");
+               }
+
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       SourceFile *src=new SourceFile(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);
+               }
+
+               Target *tarbls_tgt=builder.get_target("tarballs");
+               tarbls_tgt->add_depend(result);
 
-                       // Compile sources
-                       ObjectFile *obj=new ObjectFile(builder, *this, *src);
-                       objs.push_back(obj);
+               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);
                }
-               else if(ext==".h")
+       }
+       else
+       {
+               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
-                       Target *hdr=builder.get_target(i->str());
-                       if(!hdr)
-                               hdr=new Header(builder, this, i->str());
+                       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(!install_headers.empty())
-                               inst_tgts.push_back(hdr);
+                               // Install headers if requested
+                               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==Component::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_default_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)
-               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));
 }
 
-/**
-Collects all files belonging to the component.
-*/
 PathList Component::collect_source_files() const
 {
        PathList files;
        for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
        {
-               struct stat st;
-               stat(*i, st);
-               if(S_ISDIR(st.st_mode))
+               if(FS::is_dir(*i))
                {
                        list<string> sfiles=list_files(*i);
                        for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
@@ -166,7 +217,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);
@@ -174,6 +225,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);
@@ -181,13 +243,15 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-       comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n));
+       Package *req=comp.pkg.get_builder().get_package(n);
+       if(req)
+               comp.requires.push_back(req);
 }
 
 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;
 }
 
@@ -197,13 +261,25 @@ 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)
+{
+       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()