X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=c55e5f47272122951c2e370bc6c6d632e156eb40;hb=e71eaecb9a31304fe5e096ea29660ea25c1bfa9f;hp=3072fd6a65ccd1d6a6303d54b80ffdb789ca35da;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 3072fd6..c55e5f4 100644
--- 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();
@@ -107,7 +99,8 @@ void Package::create_build_info()
 
 void Package::process_options(const RawOptionMap &opts)
 {
-	config.process(opts);
+	if(config.process(opts))
+		config.save(source/".options.cache");
 }
 
 Package *Package::create(Builder &b, const string &name)
@@ -126,6 +119,8 @@ Package *Package::create(Builder &b, const string &name)
 			info.push_back("-lGL");
 		else if(name=="pthread")
 			info.push_back("-lpthread");
+		else if(name=="gmpxx")
+			info.push_back("-lgmpxx");
 		else
 			return 0;
 	}
@@ -156,6 +151,8 @@ void Package::init_buildable()
 		config.add_option("includedir", "$prefix/lib",     "Library installation directory");
 	if(flags&DATA)
 		config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
+
+	config.load(source/".options.cache");
 }
 
 unsigned Package::get_install_flags()
@@ -186,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()
@@ -218,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);
+}