X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=bb239b22b7d60cc83e1486aa1860aa4666a37258;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=1de15ef86781ae2696fa114eb7b3c8c0d6e344ef;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 1de15ef..bb239b2 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -27,6 +27,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s): config(*this), deps_cache(*this) { + config.load(); + components.push_back(Component(*this, Component::TARBALL, "@src")); } @@ -43,7 +45,12 @@ FS::Path SourcePackage::get_temp_dir() const subdir += '.'; subdir += build_type->get_name(); } - return source/config.get_option("tempdir").value/subdir; + + const FS::Path &temp = builder.get_temp_directory(); + if(temp.is_absolute()) + return temp/name/subdir; + else + return source/temp/subdir; } FS::Path SourcePackage::get_out_dir() const @@ -56,19 +63,6 @@ FS::Path SourcePackage::get_out_dir() const return source/arch.get_name()/detail; } -LibMode SourcePackage::get_library_mode() const -{ - const string &mode = config.get_option("staticlibs").value; - if(mode=="all") - return ALL_STATIC; - else if(mode=="local") - return LOCAL_STATIC; - else if(mode=="none") - return DYNAMIC; - else - throw runtime_error("unknown library mode"); -} - string SourcePackage::expand_string(const string &str) const { string result = str; @@ -124,15 +118,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) config.finish(); - for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) - if(i->eval()) - { - const StringList &reqs = i->get_requires(); - for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) - if(Package *pkg = builder.get_package_manager().find_package(*j)) - requires.push_back(pkg); - } - for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) { BinaryPackage *bpkg = dynamic_cast(*i); @@ -148,12 +133,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) void SourcePackage::init_config() { - config.add_option("tempdir", "temp", "Directory for storing temporary files"); - config.add_option("staticlibs", "local", "Use static libraries"); - - for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) - config.add_option("with_"+i->name, i->def_value, i->descr); - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { BinaryPackage *bpkg = dynamic_cast(*i); @@ -188,10 +167,6 @@ void SourcePackage::create_build_info() if(lexical_cast(config.get_option("with_"+i->name).value)) build_info.defines["WITH_"+toupper(i->name)] = "1"; - for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) - if(i->eval()) - build_info.update_from(i->get_build_info()); - for(list::iterator i=components.begin(); i!=components.end(); ++i) { i->create_build_info(); @@ -227,11 +202,25 @@ void SourcePackage::save_caches() SourcePackage::Loader::Loader(SourcePackage &p): DataFile::DerivedObjectLoader(p) { + init(0); +} + +SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): + DataFile::DerivedObjectLoader(p) +{ + init(&o); +} + +void SourcePackage::Loader::init(const Config::InputOptions *o) +{ + options = o; add("version", &SourcePackage::version); add("description", &SourcePackage::description); add("build_info", &Loader::build_info); add("feature", &Loader::feature); add("if", &Loader::condition); + add("if_arch", &Loader::if_arch); + add("if_feat", &Loader::if_feature); add("program", &Loader::component); add("library", &Loader::component); add("module", &Loader::component); @@ -269,13 +258,22 @@ void SourcePackage::Loader::feature(const string &n, const string &d) feat.def_value = "no"; load_sub(feat); obj.features.push_back(feat); + string config_key = "with_"+feat.name; + obj.config.add_option(config_key, feat.def_value, feat.descr); + if(options) + { + Config::InputOptions::const_iterator i = options->find(config_key); + if(i!=options->end()) + obj.config.set_option(config_key, i->second); + } } void SourcePackage::Loader::condition(const string &c) { + IO::print("%s: Note: Old-style conditions are deprecated\n", get_source()); Condition cond(obj, c); - load_sub(cond); - obj.conditions.push_back(cond); + if(cond.eval()) + load_sub_with(*this); } template @@ -301,6 +299,42 @@ void SourcePackage::Loader::headers(const string &n) install_map[*i] = "include/"+comp.get_name(); } +void SourcePackage::Loader::if_arch(const string &cond) +{ + const Architecture &arch = obj.builder.get_current_arch(); + bool negate = (cond[0]=='!'); + bool match = (arch.match_name(cond.substr(negate))!=negate); + obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not "))); + if(match) + load_sub_with(*this); +} + +void SourcePackage::Loader::if_feature(const string &cond) +{ + bool match = false; + string::size_type equals = cond.find('='); + if(equals!=string::npos) + { + if(equals==0) + error("No feature name specified"); + bool negate = cond[equals-1]=='!'; + string name = cond.substr(0, equals-negate); + string value = obj.config.get_option("with_"+name).value; + match = (value==cond.substr(equals+1))!=negate; + value = cond.substr(equals+1); + } + else + { + bool negate = (cond[0]=='!'); + string name = cond.substr(negate); + string value = obj.config.get_option("with_"+name).value; + match = lexical_cast(value)!=negate; + } + obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not "))); + if(match) + load_sub_with(*this); +} + void SourcePackage::Loader::tarball(const string &n) { if(n=="@src")