X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=c4710bca79a4f6082b7dd3e7b62297e85a247599;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=6e60b76992b4cc9123eca2906644deab8445cac4;hpb=5622fc20f0be8bff0938d24f6f45d3ab384288ca;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 6e60b76..c4710bc 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2007, 2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include #include @@ -22,22 +15,6 @@ Package::Package(Builder &b, const string &n): use_pkgconfig(true) { } -PackageList Package::collect_requires() -{ - PackageList result; - result.push_back(this); - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) - { - PackageList r=(*i)->collect_requires(); - result.splice(result.end(), r); - } - - result.sort(); - result.unique(); - - return result; -} - void Package::configure(const StringMap &opts, unsigned flag) { if(conf_done) @@ -56,7 +33,7 @@ void Package::configure(const StringMap &opts, unsigned flag) create_build_info(); - conf_done=true; + conf_done = true; } @@ -68,7 +45,7 @@ Package::Loader::Loader(Package &p): void Package::Loader::require(const string &n) { - Package *req=pkg.builder.get_package(n); + Package *req = pkg.builder.get_package(n); if(req) pkg.requires.push_back(req); }