X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=f74b4a09bdda43e905df82ff8584009b2da0b9db;hb=a116ad9af4a6a75093f6e1c3603d16b397833154;hp=8a05ddc89699950dd5d59ce2977741b4f4be47ad;hpb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 8a05ddc..f74b4a0 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -22,8 +22,7 @@ void Package::configure(const StringMap &opts, unsigned flag) if(conf_done) return; - if(builder.get_verbose()>=3) - IO::print("Configuring %s\n", name); + builder.get_logger().log("configure", format("Configuring %s", name)); do_configure(opts, flag); @@ -40,14 +39,14 @@ void Package::configure(const StringMap &opts, unsigned flag) Package::Loader::Loader(Package &p): - pkg(p) + DataFile::ObjectLoader(p) { add("require", &Loader::require); } void Package::Loader::require(const string &n) { - Package *req = pkg.builder.get_package_manager().find_package(n); + Package *req = obj.builder.get_package_manager().find_package(n); if(req) - pkg.requires.push_back(req); + obj.requires.push_back(req); }