From 3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 16 Jul 2012 12:13:31 +0300 Subject: [PATCH] Evaluate conditions at load time to allow more flexibility --- source/builder.cpp | 6 ++- source/builder.h | 3 +- source/config.cpp | 13 ++++++- source/config.h | 4 +- source/sourcepackage.cpp | 81 +++++++++++++++++++++++++++++++--------- source/sourcepackage.h | 6 ++- 6 files changed, 87 insertions(+), 26 deletions(-) diff --git a/source/builder.cpp b/source/builder.cpp index 03429cf..6332331 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -650,7 +650,11 @@ void Builder::Loader::package(const string &n) if(!obj.main_pkg) obj.main_pkg = pkg; - load_sub(*pkg); + if(obj.conf_all || pkg==obj.main_pkg) + load_sub(*pkg, obj.cmdline_options); + else + load_sub(*pkg); + if(obj.build_type) pkg->set_build_type(*obj.build_type); } diff --git a/source/builder.h b/source/builder.h index cdf615d..943c851 100644 --- a/source/builder.h +++ b/source/builder.h @@ -19,7 +19,6 @@ #include "virtualfilesystem.h" class Analyzer; -class Config; class FileTarget; class Package; class SourcePackage; @@ -53,7 +52,7 @@ private: typedef std::map BuildTypeMap; StringList cmdline_targets; - StringMap cmdline_options; + Config::InputOptions cmdline_options; Msp::FS::Path cwd; PackageManager package_manager; diff --git a/source/config.cpp b/source/config.cpp index 5b43fe3..4890263 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -18,7 +18,10 @@ Config::Config(SourcePackage &p): void Config::add_option(const string &n, const string &v, const string &d) { - options.insert(OptionMap::value_type(n, Option(n, v, d))); + Option opt(n, v, d); + if(pending_options.count(n)) + opt.value = pending_options[n]; + options.insert(OptionMap::value_type(n, opt)); } const Config::Option &Config::get_option(const string &name) const @@ -77,7 +80,10 @@ bool Config::set_option(const string &opt, const string &val) if(i!=options.end()) { if(i->second.value!=val) + { result = true; + changed = true; + } i->second.value = val; } @@ -119,5 +125,8 @@ Config::Loader::Loader(Config &c): void Config::Loader::option(const string &n, const string &v) { - obj.set_option(n, v); + if(obj.options.count(n)) + obj.set_option(n, v); + else + obj.pending_options[n] = v; } diff --git a/source/config.h b/source/config.h index f18487b..64e4225 100644 --- a/source/config.h +++ b/source/config.h @@ -29,6 +29,7 @@ public: }; typedef std::map OptionMap; + typedef std::map InputOptions; private: class Loader: public Msp::DataFile::ObjectLoader @@ -41,6 +42,7 @@ private: SourcePackage &package; OptionMap options; + InputOptions pending_options; Msp::Time::TimeStamp mtime; bool changed; @@ -69,9 +71,7 @@ public: void finish(); void save() const; -private: bool set_option(const std::string &, const std::string &); -public: void load(); }; diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 029d524..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")); } @@ -116,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); @@ -140,9 +133,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) void SourcePackage::init_config() { - 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); @@ -177,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(); @@ -216,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); @@ -258,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 @@ -290,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") diff --git a/source/sourcepackage.h b/source/sourcepackage.h index 755bdfc..9327f17 100644 --- a/source/sourcepackage.h +++ b/source/sourcepackage.h @@ -30,11 +30,14 @@ public: class Loader: public Msp::DataFile::DerivedObjectLoader { private: + const Config::InputOptions *options; std::map install_map; public: Loader(SourcePackage &); + Loader(SourcePackage &, const Config::InputOptions &); private: + void init(const Config::InputOptions *); virtual void finish(); void feature(const std::string &, const std::string &); template @@ -42,6 +45,8 @@ public: void condition(const std::string &); void build_info(); void headers(const std::string &); + void if_arch(const std::string &); + void if_feature(const std::string &); void tarball(const std::string &); void tar_file(const std::string &); }; @@ -54,7 +59,6 @@ private: const BuildType *build_type; FeatureList features; BuildInfo build_info; - ConditionList conditions; ComponentList components; Config config; mutable DependencyCache deps_cache; -- 2.45.2