author | Michael Krelin <hacker@klever.net> | 2005-03-31 20:07:16 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-03-31 20:07:16 (UTC) |
commit | 185d182cd6d3e0593a3627837f3bb400b654e602 (patch) (unidiff) | |
tree | bf848291cf5fb161df0a028ca9f3a3095f862d0b | |
parent | c9a601eeae3457d28fb1dfd7592ce29d2b06f411 (diff) | |
download | sitecing-185d182cd6d3e0593a3627837f3bb400b654e602.zip sitecing-185d182cd6d3e0593a3627837f3bb400b654e602.tar.gz sitecing-185d182cd6d3e0593a3627837f3bb400b654e602.tar.bz2 |
Yes, I did break dependency handling a bit.
-rw-r--r-- | lib/component_factory.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/component_factory.cc b/lib/component_factory.cc index 2a2eefe..5c18bb7 100644 --- a/lib/component_factory.cc +++ b/lib/component_factory.cc | |||
@@ -76,6 +76,7 @@ namespace sitecing { | |||
76 | deps.push_back(root_intermediate+str+".classname"); | 76 | deps.push_back(root_intermediate+str+".classname"); |
77 | } | 77 | } |
78 | } | 78 | } |
79 | // XXX: intermediate_deps should be broken down | ||
79 | config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps); | 80 | config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps); |
80 | if(co_intermediate_deps) { | 81 | if(co_intermediate_deps) { |
81 | for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i) | 82 | for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i) |
@@ -101,7 +102,12 @@ namespace sitecing { | |||
101 | } | 102 | } |
102 | } | 103 | } |
103 | } | 104 | } |
104 | // XXX: extra deps like IntermediateDeps? | 105 | // XXX: intermediate_deps should be broken down |
106 | config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps); | ||
107 | if(co_intermediate_deps) { | ||
108 | for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i) | ||
109 | deps.push_back(*i); | ||
110 | } | ||
105 | }catch(utility_no_suffix& uns) { } | 111 | }catch(utility_no_suffix& uns) { } |
106 | } | 112 | } |
107 | }catch(utility_no_prefix& unp) { } | 113 | }catch(utility_no_prefix& unp) { } |