| author | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
| commit | 54e344b7e3623e807b893b7febad3adfc6c1648f (patch) (side-by-side diff) | |
| tree | ded792083882fbe452992b6808487baec269526a /lib | |
| parent | 83cf01018c67e7eb5e1cca7d698bac731f8e1e9d (diff) | |
| download | sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.zip sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.gz sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.bz2 | |
1. setting up of SITECING_PATH_INFO environment variable
2. bumped up kingate version requirement
3. fixed a bug in component build process
| -rw-r--r-- | lib/component_factory.cc | 2 | ||||
| -rw-r--r-- | lib/file_factory.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/component_factory.cc b/lib/component_factory.cc index b5e95af..d9692de 100644 --- a/lib/component_factory.cc +++ b/lib/component_factory.cc @@ -89,13 +89,13 @@ namespace sitecing { for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) { try { string nos = strip_suffix(noro,cc_targets[cct]); deps.push_back(root_intermediate+nos+".cc"); config_options *co_cpp_deps = config.lookup_config(noro,config_options::flag_cpp_deps); if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) { - ifstream df((root_intermediate+noro+".d").c_str(),ios::in); + ifstream df((root_intermediate+nos+".d").c_str(),ios::in); if(df.good()) { string str; while(!df.eof()) { df >> str; if(str.find_first_of("\\:")==string::npos) deps.push_back(combine_path(config.root_source+nos,str)); diff --git a/lib/file_factory.cc b/lib/file_factory.cc index 7ca7b86..c22fac2 100644 --- a/lib/file_factory.cc +++ b/lib/file_factory.cc @@ -15,13 +15,13 @@ namespace sitecing { file_list_t deplist; file_list_t *fl = deps?deps:&deplist; get_dependencies(dst,*fl); struct stat stdst; if(stat(dst.c_str(),&stdst)) return false; - for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) { + for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) { struct stat stdep; if(stat(i->c_str(),&stdep)) return false; if(stdst.st_mtime<stdep.st_mtime) return false; if(!is_uptodate(*i)) |