X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ef0e60cbb7b2a3373dea85d6da7e50a5426ac6bd;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=5d1d6837ed5e903a07dc6423d28154ad442a7cc4;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 5d1d683..ef0e60c 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -19,7 +19,7 @@ using namespace Msp; /** Creates a buildable package. */ -SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s): +SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s): Package(b, n), source(s), config(*this), @@ -28,12 +28,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s): tar_files.push_back(source/"Build"); } -Msp::Path::Path SourcePackage::get_temp_dir() const +Msp::Path SourcePackage::get_temp_dir() const { - return source/config.get_option("tempdir").value/config.get_option("profile").value; + return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value; } -Msp::Path::Path SourcePackage::get_out_dir() const +Msp::Path SourcePackage::get_out_dir() const { return source/config.get_option("outdir").value; } @@ -75,36 +75,6 @@ LibMode SourcePackage::get_library_mode() const throw Exception("Unknown library mode"); } -/** -Tries to resolve all references to dependency packages. -*/ -void SourcePackage::resolve_refs() -{ - Package::resolve_refs(); - - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - if(i->get_package()) - all_reqs.push_back(i->get_package()); - - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - { - i->resolve_refs(); - const PkgRefList &creqs=i->get_requires(); - for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j) - if(j->get_package()) - all_reqs.push_back(j->get_package()); - } - - for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) - { - i->resolve_refs(); - const PkgRefList &creqs=i->get_requires(); - for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j) - if(j->get_package()) - all_reqs.push_back(j->get_package()); - } -} - /*** private ***/ /** @@ -134,12 +104,21 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) if(i->eval()) { - const PkgRefList &reqs=i->get_requires(); - requires.insert(requires.end(), reqs.begin(), reqs.end()); - build_info.add(i->get_build_info()); + const StringList &reqs=i->get_requires(); + for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) + if(Package *pkg=builder.get_package(*j)) + requires.push_back(pkg); } - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + base_reqs=requires; + + for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) + { + const PackageList &reqs=i->get_requires(); + requires.insert(requires.end(), reqs.begin(), reqs.end()); + } + + for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) { BinaryPackage *bpkg=dynamic_cast(*i); if(bpkg && bpkg->get_need_path()) @@ -148,8 +127,8 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) deps_cache.load(); - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) - (*i)->configure(opts, flag&2); + /*for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + (*i)->configure(opts, flag&2);*/ } /** @@ -164,29 +143,16 @@ void SourcePackage::init_config() config.add_option("strip", "0", "Strip symbols from programs"); config.add_option("debug", "0", "Produce debugging symbols"); config.add_option("cpu", "auto", "CPU type to optimize for"); - config.add_option("arch", "native", "Architecture for cross-compiling"); config.add_option("staticlibs", "local", "Use static libraries"); - unsigned flags=get_install_flags(); - if(flags) - config.add_option("prefix", "$HOME/local", "Installation prefix"); - /*if(flags&INCLUDE) - config.add_option("includedir", "$prefix/include", "Header installation directory"); - if(flags&BIN) - config.add_option("includedir", "$prefix/bin", "Binary installation directory"); - if(flags&LIB) - config.add_option("includedir", "$prefix/lib", "Library installation directory"); - if(flags&DATA) - config.add_option("includedir", "$prefix/share", "Data installation directory");*/ - for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) config.add_option("with_"+i->name, "0", i->descr); - for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { BinaryPackage *bpkg=dynamic_cast(*i); if(bpkg && bpkg->get_need_path()) - config.add_option(bpkg->get_name()+"_path", "", "Path for "+bpkg->get_name()); + config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name()); } } @@ -196,12 +162,9 @@ configured when this is called. */ void SourcePackage::create_build_info() { - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i) { - Package *pkg=i->get_package(); - if(!pkg) - continue; - const BuildInfo &ebi=pkg->get_exported_binfo(); + const BuildInfo &ebi=(*i)->get_exported_binfo(); build_info.add(ebi); export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end()); @@ -218,10 +181,13 @@ void SourcePackage::create_build_info() unsigned flags=get_install_flags(); + build_info.incpath.push_back((Path(builder.get_prefix())/"include").str()); + build_info.libpath.push_back((Path(builder.get_prefix())/"lib").str()); + if(flags&INCLUDE) - export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str()); + export_binfo.incpath.push_back((Path(builder.get_prefix())/"include").str()); if(flags&LIB) - export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str()); + export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str()); string optimize=config.get_option("optimize").value; if(lexical_cast(optimize)) @@ -243,6 +209,10 @@ void SourcePackage::create_build_info() if(lexical_cast(config.get_option("with_"+i->name).value)) build_info.cflags.push_back("-DWITH_"+toupper(i->name)); + for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) + if(i->eval()) + build_info.add(i->get_build_info()); + build_info.unique(); for(list::iterator i=components.begin(); i!=components.end(); ++i)