| 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 | |||
| @@ -73,12 +73,13 @@ namespace sitecing { | |||
| 73 | while(!ancestors.eof()) { | 73 | while(!ancestors.eof()) { |
| 74 | ancestors >> str; | 74 | ancestors >> str; |
| 75 | if(!str.empty()) | 75 | if(!str.empty()) |
| 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) |
| 82 | deps.push_back(*i); | 83 | deps.push_back(*i); |
| 83 | } | 84 | } |
| 84 | return; | 85 | return; |
| @@ -98,13 +99,18 @@ namespace sitecing { | |||
| 98 | df >> str; | 99 | df >> str; |
| 99 | if(str.find_first_of("\\:")==string::npos) | 100 | if(str.find_first_of("\\:")==string::npos) |
| 100 | deps.push_back(combine_path(config.root_source+nos,str)); | 101 | deps.push_back(combine_path(config.root_source+nos,str)); |
| 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) { } |
| 108 | } | 114 | } |
| 109 | 115 | ||
| 110 | bool component_factory::is_uptodate(const string& dst,file_list_t *deps) { | 116 | bool component_factory::is_uptodate(const string& dst,file_list_t *deps) { |