Refactor code to get rid of class PackageRef

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b..20fec32acfb84d64665ff2c05372482761de3eb2 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -26,15 +26,6 @@ Package::Package(Builder &b, const string &n):
        use_pkgconfig(true)
 { }
 
-/**
-Tries to resolve all references to dependency packages.
-*/
-void Package::resolve_refs()
-{
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->resolve();
-}
-
 /**
 Processes configuration options that were most likely obtained from the command
 line.
@@ -49,8 +40,11 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
        do_configure(opts, flag);
 
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->get_package()->configure(opts, flag&2);
+       requires.sort();
+       requires.unique();
+
+       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               (*i)->configure(opts, flag&2);
 
        create_build_info();
 
@@ -67,5 +61,7 @@ Package::Loader::Loader(Package &p):
 
 void Package::Loader::require(const string &n)
 {
-       pkg.requires.push_back(PackageRef(pkg.builder, n));
+       Package *req=pkg.builder.get_package(n);
+       if(req)
+               pkg.requires.push_back(req);
 }