X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5a735d09c4e6561484704d33e388906d542e404c;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=93d450b4a47372297e6da6c797006837b4c4e277;hpb=4ce2beaa6d1cab7ed8063bbe1472e13a4280ebc0;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 93d450b..5a735d0 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -23,25 +23,24 @@ using namespace std; using namespace Msp; Component::Component(SourcePackage &p, Type t, const string &n): - pkg(p), + package(p), type(t), name(n), install(false), deflt(true) { } -void Component::configure(const StringMap &opts, unsigned flag) +void Component::prepare() { - for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i) - *i = (pkg.get_source()/pkg.expand_string(*i)).str(); - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) - (*i)->configure(opts, flag&2); + (*i)->prepare(); } void Component::create_build_info() { - const PackageList &pkg_reqs = pkg.get_requires(); + BuildInfo final_build_info; + + const PackageList &pkg_reqs = package.get_required_packages(); PackageList direct_reqs = requires; direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end()); @@ -51,20 +50,23 @@ void Component::create_build_info() BuildInfo::UpdateLevel level = BuildInfo::CHAINED; if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end()) level = BuildInfo::DEPENDENCY; - build_info.update_from((*i)->get_exported_binfo(), level); + final_build_info.update_from((*i)->get_exported_build_info(), level); - const PackageList &reqs = (*i)->get_requires(); + const PackageList &reqs = (*i)->get_required_packages(); for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end()) all_reqs.push_back(*j); } - build_info.update_from(pkg.get_build_info()); + final_build_info.update_from(package.get_build_info()); for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); + *i = (package.get_source_directory() / *i).str(); for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); + *i = (package.get_source_directory() / *i).str(); + + final_build_info.update_from(build_info); + build_info = final_build_info; if(type==LIBRARY || type==MODULE) if(build_info.libmodeget_exported_binfo(); + const BuildInfo &ebi = (*i)->get_exported_build_info(); build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); } } @@ -82,10 +84,8 @@ void Component::create_build_info() void Component::create_targets() const { - Builder &builder = pkg.get_builder(); + Builder &builder = package.get_builder(); const Toolchain &toolchain = builder.get_toolchain(); - Target *world = builder.get_target("world"); - Target *def_tgt = builder.get_target("default"); PathList source_filenames = collect_source_files(); list inst_list; @@ -98,8 +98,8 @@ void Component::create_targets() const string tarname = name; if(name=="@src") { - tarname = pkg.get_name()+"-"+pkg.get_version(); - source_filenames.push_back(pkg.get_source()/"Build"); + tarname = package.get_name()+"-"+package.get_version(); + source_filenames.push_back(package.get_source_directory()/"Build"); } list files; @@ -115,7 +115,7 @@ void Component::create_targets() const { const Builder::TargetMap &targets = builder.get_targets(); for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->get_package()==&pkg && !i->second->is_buildable()) + if(i->second->get_package()==&package && !i->second->is_buildable()) files.push_back(i->second); } @@ -124,7 +124,7 @@ void Component::create_targets() const /*Target *result = tar.create_target(files, tarname); Target *tarballs_tgt = builder.get_target("tarballs"); - tarballs_tgt->add_depend(*result);*/ + tarballs_tgt->add_dependency(*result);*/ return; } @@ -137,7 +137,7 @@ void Component::create_targets() const if(Target *tgt = builder.get_vfs().get_target(*i)) ft = dynamic_cast(tgt); else - ft = new File(builder, pkg, *i); + ft = new File(builder, package, *i); inst_list.push_back(ft); } } @@ -149,13 +149,10 @@ void Component::create_targets() const if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) source = dynamic_cast(tgt); else - source = new File(builder, pkg, source_filenames.front()); + source = new File(builder, package, source_filenames.front()); Target *result = dcomp.create_target(*source); - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(*result); - else - world->add_depend(*result); + builder.add_primary_target(*result); if(install) inst_list.push_back(result); } @@ -197,10 +194,7 @@ void Component::create_targets() const for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(**i); - else - world->add_depend(**i); + builder.add_primary_target(**i); if(install) inst_list.push_back(*i); } @@ -211,7 +205,7 @@ void Component::create_targets() const for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) { Target *inst = copy.create_target(**i, inst_loc); - inst_tgt->add_depend(*inst); + inst_tgt->add_dependency(*inst); } } @@ -223,7 +217,7 @@ PathList Component::collect_source_files() const FS::Path path(*i); if(FS::is_dir(path)) { - pkg.get_builder().get_logger().log("files", format("Traversing %s", path)); + package.get_builder().get_logger().log("files", format("Traversing %s", path)); list sfiles = list_files(path); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) files.push_back(path / *j); @@ -249,12 +243,12 @@ Component::Loader::Loader(Component &c): void Component::Loader::source(const string &s) { - obj.sources.push_back(s); + obj.sources.push_back((obj.package.get_source_directory()/s).str()); } void Component::Loader::require(const string &n) { - Package *req = obj.pkg.get_builder().get_package_manager().find_package(n); + Package *req = obj.package.get_builder().get_package_manager().find_package(n); if(req) obj.requires.push_back(req); } @@ -266,5 +260,5 @@ void Component::Loader::build_info() void Component::Loader::install_map() { - load_sub(obj.install_map, obj.pkg.get_source()); + load_sub(obj.install_map, obj.package.get_source_directory()); }