Refactor code to get rid of class PackageRef

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index f10f0eb9cb331eb41f32b2b053786366fdb19b2f..6ee210177f32a077935223d17203d924da9d45dd 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -173,8 +173,6 @@ Package *Builder::get_package(const string &n)
        Package *pkg=BinaryPackage::from_pkgconfig(*this, n);
 
        packages.insert(PackageMap::value_type(n, pkg));
-       if(pkg)
-               new_pkgs.push_back(pkg);
 
        return pkg;
 }
@@ -331,13 +329,6 @@ int Builder::main()
                return 1;
        }
 
-       while(!new_pkgs.empty())
-       {
-               Package *pkg=new_pkgs.front();
-               new_pkgs.erase(new_pkgs.begin());
-               pkg->resolve_refs();
-       }
-
        default_pkg->configure(cmdline_options, conf_all?2:1);
 
        if(help)
@@ -773,12 +764,12 @@ void Builder::package_help()
        const Config::OptionMap &options=config.get_options();
 
        cout<<"Required packages:\n  ";
-       const PkgRefList &requires=default_pkg->get_requires();
-       for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+       const PackageList &requires=default_pkg->get_requires();
+       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
        {
                if(i!=requires.begin())
                        cout<<", ";
-               cout<<i->get_name();
+               cout<<(*i)->get_name();
        }
        cout<<"\n\n";
        cout<<"Package configuration:\n";
@@ -812,7 +803,6 @@ void Builder::Loader::binpkg(const string &n)
        BinaryPackage *pkg=new BinaryPackage(bld, n);
        load_sub(*pkg);
        bld.packages.insert(PackageMap::value_type(n, pkg));
-       bld.new_pkgs.push_back(pkg);
 }
 
 void Builder::Loader::profile(const string &n)
@@ -825,11 +815,11 @@ void Builder::Loader::profile(const string &n)
 void Builder::Loader::package(const string &n)
 {
        SourcePackage *pkg=new SourcePackage(bld, n, src);
-       load_sub(*pkg);
-       bld.packages.insert(PackageMap::value_type(n, pkg));
-       bld.new_pkgs.push_back(pkg);
        if(!bld.default_pkg)
                bld.default_pkg=pkg;
+
+       load_sub(*pkg);
+       bld.packages.insert(PackageMap::value_type(n, pkg));
 }