/* $Id$
This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
+#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 "header.h"
#include "install.h"
#include "objectfile.h"
-#include "package.h"
#include "sharedlibrary.h"
+#include "sourcepackage.h"
#include "staticlibrary.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),
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)
+ {
+ // 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)
{
- if(!i->get_package())
- continue;
- //i->get_package()->create_build_info();
- build_info.add(i->get_package()->get_exported_binfo());
+ string strip=pkg.get_config().get_option("strip").value;
+ if(lexical_cast<bool>(strip))
+ build_info.ldflags.push_back("-s");
}
if(modular)
build_info.unique();
}
-/**
-Creates all targets needed for building this component.
-*/
void Component::create_targets() const
{
Builder &builder=pkg.get_builder();
PathList files=collect_source_files();
- bool build_exe=(type!=Component::HEADERS);
+ bool build_exe=(type!=HEADERS);
list<ObjectFile *> objs;
- list<Target *> inst_tgts;
+ list<FileTarget *> inst_tgts;
for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
{
- string basename=(*i)[-1];
- string ext=Path::splitext(basename).ext;
+ string ext=FS::extpart(FS::basename(*i));
if((ext==".cpp" || ext==".c") && build_exe)
{
SourceFile *src=new SourceFile(builder, this, i->str());
}
else 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())
+ if(type==HEADERS && install)
inst_tgts.push_back(hdr);
}
}
if(build_exe)
{
- Executable *exe=0;
+ Binary *bin=0;
StaticLibrary *slib=0;
- if(type==Component::LIBRARY)
+ if(type==LIBRARY)
{
- exe=new SharedLibrary(builder, *this, objs);
+ bin=new SharedLibrary(builder, *this, objs);
slib=new StaticLibrary(builder, *this, objs);
}
else
- exe=new Executable(builder, *this, objs);
+ bin=new Executable(builder, *this, objs);
- if(&pkg==builder.get_default_package() && deflt)
+ if(&pkg==builder.get_main_package() && deflt)
{
- def_tgt->add_depend(exe);
+ def_tgt->add_depend(bin);
if(slib) def_tgt->add_depend(slib);
}
else
{
- world->add_depend(exe);
+ world->add_depend(bin);
if(slib) world->add_depend(slib);
}
if(install)
{
- inst_tgts.push_back(exe);
+ inst_tgts.push_back(bin);
if(slib)
inst_tgts.push_back(slib);
}
}
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_tgts.begin(); i!=inst_tgts.end(); ++i)
inst_tgt->add_depend(new Install(builder, pkg, **i));
}
-/**
-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)
{
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);
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);
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()
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);
projects / builder.git / blobdiff