X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=a7dfc34f7fff6091035e4c38cc2ec5c1fa150d45;hb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;hp=87252d574f98c67548861757cacbdc931a6bdf1e;hpb=49ee08bb6f63f6b3a8cdd3b7cf032dea9b2cba8a;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 87252d5..a7dfc34 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,12 +1,4 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include -#include #include #include #include @@ -23,9 +15,10 @@ Distributed under the LGPL #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" -#include "symlink.h" #include "tarball.h" #include "target.h" +#include "tool.h" +#include "toolchain.h" using namespace std; using namespace Msp; @@ -35,11 +28,18 @@ Component::Component(SourcePackage &p, Type t, const string &n): type(t), name(n), install(false), - module_host(0), - modular(false), deflt(true) { } +void Component::configure(const StringMap &opts, unsigned flag) +{ + for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i) + *i = (pkg.get_source()/pkg.expand_string(*i)).str(); + + for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->configure(opts, flag&2); +} + void Component::create_build_info() { const PackageList &pkg_reqs = pkg.get_requires(); @@ -92,69 +92,64 @@ void Component::create_build_info() build_info.cflags.push_back("-fPIC"); } - if(modular) - { - build_info.ldflags.push_back("-rdynamic"); - build_info.libs.push_back("dl"); - } - else if(module_host) - { - const PathList &host_src = module_host->get_sources(); - for(PathList::const_iterator i=host_src.begin(); i!=host_src.end(); ++i) - build_info.incpath.push_back(i->str()); - } - build_info.unique(); } void Component::create_targets() const { Builder &builder = pkg.get_builder(); + const Toolchain &toolchain = builder.get_toolchain(); Target *world = builder.get_target("world"); Target *def_tgt = builder.get_target("default"); - PathList files = collect_source_files(); - list inst_list; + PathList source_filenames = collect_source_files(); + list inst_list; string inst_loc; if(type==TARBALL) { + //const Tool &tar = toolchain.get_tool("TAR"); + string tarname = name; if(name=="@src") + { tarname = pkg.get_name()+"-"+pkg.get_version(); - TarBall *result = new TarBall(builder, pkg, tarname); + source_filenames.push_back(pkg.get_source()/"Build"); + } - if(name=="@src") + list files; + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { - 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"); + FileTarget *file = builder.get_vfs().get_target(*i); + if(!file) + file = new File(builder, *i); + files.push_back(file); } - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + if(name=="@src") { - FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) - ft = dynamic_cast(tgt); - else - ft = new File(builder, *i); - result->add_depend(ft); + const Builder::TargetMap &targets = builder.get_targets(); + for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->get_package()==&pkg && !i->second->is_buildable()) + files.push_back(i->second); } - Target *tarbls_tgt = builder.get_target("tarballs"); - tarbls_tgt->add_depend(result); + /* XXX The source files don't have a package at the moment, so we can't + create the tarball target until things get fixed up a bit */ + /*Target *result = tar.create_target(files, tarname); + + Target *tarballs_tgt = builder.get_target("tarballs"); + tarballs_tgt->add_depend(result);*/ return; } else if(type==INSTALL) { inst_loc = name; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) + if(Target *tgt = builder.get_vfs().get_target(*i)) ft = dynamic_cast(tgt); else ft = new File(builder, pkg, *i); @@ -163,12 +158,14 @@ void Component::create_targets() const } else if(type==DATAFILE) { + const Tool &dcomp = toolchain.get_tool("DATA"); + File *source; - if(Target *tgt = builder.get_target(files.front().str())) + if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) source = dynamic_cast(tgt); else - source = new File(builder, pkg, files.front()); - ::DataFile *result = new ::DataFile(builder, *this, *source); + source = new File(builder, pkg, source_filenames.front()); + Target *result = dcomp.create_target(*source); if(&pkg==builder.get_main_package() && deflt) def_tgt->add_depend(result); @@ -179,12 +176,12 @@ void Component::create_targets() const } else { - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); if(ext==".h") { - FileTarget *hdr = dynamic_cast(builder.get_target(i->str())); + FileTarget *hdr = builder.get_vfs().get_target(*i); if(!hdr) hdr = new Header(builder, *this, i->str()); @@ -197,28 +194,34 @@ void Component::create_targets() const if(type==PROGRAM || type==LIBRARY || type==MODULE) { - list objs; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + list objs; + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); - if((ext==".cpp" || ext==".cc" || ext==".c")) + const Tool *tool = toolchain.get_tool_for_suffix(ext); + if(tool) { - SourceFile *src = new SourceFile(builder, *this, i->str()); - ObjectFile *obj = new ObjectFile(builder, *this, *src); + Target *src = tool->create_source(*this, *i); + Target *obj = tool->create_target(*src); objs.push_back(obj); } } - list results; + const Tool &linker = toolchain.get_tool("LINK"); + + list results; if(type==LIBRARY) { - results.push_back(new SharedLibrary(builder, *this, objs)); - results.push_back(new StaticLibrary(builder, *this, objs)); + const Tool &archiver = toolchain.get_tool("AR"); + results.push_back(linker.create_target(objs, "shared")); + results.push_back(archiver.create_target(objs)); } + else if(type==MODULE) + results.push_back(linker.create_target(objs, "shared")); else - results.push_back(new Executable(builder, *this, objs)); + results.push_back(linker.create_target(objs)); - for(list::const_iterator i=results.begin(); i!=results.end(); ++i) + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { if(&pkg==builder.get_main_package() && deflt) def_tgt->add_depend(*i); @@ -230,30 +233,28 @@ void Component::create_targets() const } Target *inst_tgt = builder.get_target("install"); - for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) + const Tool © = toolchain.get_tool("CP"); + for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) { - Install *inst = new Install(builder, pkg, **i, inst_loc); + Target *inst = copy.create_target(**i, inst_loc); inst_tgt->add_depend(inst); - - if(type==LIBRARY) - if(SharedLibrary *shlib = dynamic_cast(*i)) - inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name())); } } PathList Component::collect_source_files() const { PathList files; - for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) { - if(FS::is_dir(*i)) + FS::Path path(*i); + if(FS::is_dir(path)) { - list sfiles = list_files(*i); + list sfiles = list_files(path); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) - files.push_back(*i / *j); + files.push_back(path / *j); } else - files.push_back(*i); + files.push_back(path); } return files; @@ -286,7 +287,7 @@ void Component::Loader::finish() void Component::Loader::source(const string &s) { - comp.sources.push_back(comp.pkg.get_source()/s); + comp.sources.push_back(s); } void Component::Loader::require(const string &n) @@ -298,24 +299,14 @@ void Component::Loader::require(const string &n) void Component::Loader::modular() { - if(comp.type!=PROGRAM) - throw Exception("Only programs can be modular"); - comp.modular = true; + IO::print("%s: Note: modular is deprecated\n", get_source()); + comp.build_info.ldflags.push_back("-rdynamic"); + comp.build_info.libs.push_back("dl"); } -void Component::Loader::host(const string &n) +void Component::Loader::host(const string &) { - const ComponentList &comps = comp.pkg.get_components(); - for(ComponentList::const_iterator i=comps.begin(); i!=comps.end(); ++i) - if(i->get_name()==n) - { - if(i->get_type()!=PROGRAM || !i->is_modular()) - throw Exception("Module host must be a modular program"); - comp.module_host = &*i; - return; - } - - throw KeyError("Unknown component", n); + IO::print("%s: Note: host is deprecated\n", get_source()); } void Component::Loader::install_headers(const string &p)