X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=06ab5fe7441953a9652b9ae40b2c2df208755de9;hb=3b13563d75a8fd711a9cf87cae62960f90a5bc39;hp=ca49976a9c95cddefe6b1e9d0e8fa54618c3e9ef;hpb=f7e0a54c49480981a8d9bec064375323fce0aaf1;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index ca49976..06ab5fe 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -63,25 +63,6 @@ FS::Path SourcePackage::get_out_dir() const return source/arch.get_name()/detail; } -void SourcePackage::do_configure(const StringMap &opts, unsigned flag) -{ - init_config(); - - config.load(); - - if(flag && config.update(opts)) - builder.get_logger().log("configure", format("Configuration of %s changed", name)); - - deps_cache.load(); - - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - i->configure(opts, flag); -} - -void SourcePackage::init_config() -{ -} - void SourcePackage::create_build_info() { if(build_type) @@ -110,6 +91,7 @@ void SourcePackage::create_build_info() for(list::iterator i=components.begin(); i!=components.end(); ++i) { + i->prepare(); i->create_build_info(); if(i->get_type()==Component::LIBRARY) export_binfo.libs.push_back(i->get_name()); @@ -118,6 +100,8 @@ void SourcePackage::create_build_info() void SourcePackage::create_targets() { + deps_cache.load(); + bool pc_needed = false; for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) {