Allow requirements for components

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 121213f19b068147f062d3afb5f4233f143ced26..c55e5f47272122951c2e370bc6c6d632e156eb40 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -7,19 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
-       builder(b),
-       name(n),
-       package(0)
-{ }
-
-Package *PackageRef::resolve()
-{
-       if(!package)
-               package=builder.get_package(name);
-       return package;
-}
-
 Package::Package(Builder &b, const string &n, const Path::Path &s):
        builder(b),
        name(n),
@@ -51,6 +38,8 @@ void Package::resolve_refs()
 {
        for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
                i->resolve();
+       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+               i->resolve_refs();
 }
 
 void Package::create_build_info()
@@ -90,7 +79,10 @@ void Package::create_build_info()
        }
 
        if(strtobool(config.get_option("debug").value))
+       {
                build_info.cflags.push_back("-ggdb");
+               build_info.defines.push_back("DEBUG");
+       }
 
        build_info.unique();
        export_binfo.unique();
@@ -191,6 +183,7 @@ Package::Loader::Loader(Package &p):
        add("program",     &Loader::program);
        add("library",     &Loader::library);
        add("headers",     &Loader::headers);
+       add("build_info",  &Loader::build_info);
 }
 
 Package::Loader::~Loader()
@@ -223,3 +216,8 @@ void Package::Loader::headers(const string &n)
        load_sub(prog);
        pkg.components.push_back(prog);
 }
+
+void Package::Loader::build_info()
+{
+       load_sub(pkg.build_info);
+}