Distributed under the LGPL
*/
-#include <msp/core/error.h>
+#include <msp/core/except.h>
#include <msp/path/utils.h>
#include <msp/strings/lexicalcast.h>
#include "builder.h"
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.
*/
{
build_info.add(pkg.get_build_info());
- for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
- {
- if(!i->get_package())
- continue;
- //i->get_package()->create_build_info();
- build_info.add(i->get_package()->get_exported_binfo());
- }
+ 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(type==PROGRAM)
{
for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
{
string basename=(*i)[-1];
- string ext=Path::splitext(basename).ext;
+ string ext=splitext(basename).ext;
if((ext==".cpp" || ext==".c") && build_exe)
{
SourceFile *src=new SourceFile(builder, this, i->str());
else
exe=new Executable(builder, *this, objs);
- if(&pkg==builder.get_default_package() && deflt)
+ if(&pkg==builder.get_main_package() && deflt)
{
def_tgt->add_depend(exe);
if(slib) def_tgt->add_depend(slib);
PathList files;
for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
{
- struct stat st;
- stat(*i, st);
+ struct stat st=stat(*i);
if(S_ISDIR(st.st_mode))
{
list<string> sfiles=list_files(*i);
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()