From 642dc685bd0a3f1526e22827a4539aa0e06aeff7 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 29 Mar 2005 21:03:31 +0000 Subject: split .so generation into compile and link stage --- diff --git a/lib/component_factory.cc b/lib/component_factory.cc index bcf19f2..f8666dc 100644 --- a/lib/component_factory.cc +++ b/lib/component_factory.cc @@ -20,6 +20,7 @@ namespace sitecing { static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors" }; + static const char *cc_targets[] = { ".o", ".d" }; component_factory::component_factory(configuration& c) : config(c), @@ -41,19 +42,7 @@ namespace sitecing { try { string noso = strip_suffix(dp,".so"); string noro = strip_prefix(noso,root_so); - deps.push_back(root_intermediate+noro+".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); - 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+noro,str)); - } - } - } + deps.push_back(root_intermediate+noro+".o"); config_options *co_so_deps = config.lookup_config(noro,config_options::flag_so_deps); if(co_so_deps) { for(list::const_iterator i=co_so_deps->so_deps.begin();i!=co_so_deps->so_deps.end();++i) @@ -98,6 +87,29 @@ namespace sitecing { // do nothing. must be a cpp dependency. } } + // compiler targets + for(int cct=0;cctcpp_deps) { + ifstream df((root_intermediate+noro+".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+noro,str)); + } + } + } + // XXX: extra deps like IntermediateDeps? + }catch(utility_no_affix& una) { + // do nothing. + } + } } bool component_factory::is_uptodate(const string& dst,file_list_t *deps) { @@ -129,38 +141,27 @@ namespace sitecing { try { string noso = strip_suffix(dp,".so"); string noro = strip_prefix(noso,root_so); - string cc = root_intermediate+noro+".cc"; - if(access(cc.c_str(),R_OK)) - throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")"); + string o = root_intermediate+noro+".o"; + if(access(o.c_str(),R_OK)) + throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")"); make_path(dir_name(root_so+noro),0755); - string pwd = dir_name(root_source+noro); - auto_chdir dir_changer(pwd); - file_lock lock_source(root_intermediate+noro+".lock"); + file_lock lock_cc(root_intermediate+noro+".o.lock"); file_lock lock_so(root_so+noro+".so.lock"); - int stdO = open((root_intermediate+noro+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); + int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); if(stdO<0) - throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout"); - int stdE = open((root_intermediate+noro+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); + throw konforka::exception(CODEPOINT,"failed to open/create linker stdout"); + int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); if(stdE<0) { close(stdO); - throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr"); + throw konforka::exception(CODEPOINT,"failed to open/create linker stderr"); } list args; - config_options *co_cpp_flags = config.lookup_config(noro,config_options::flag_cpp_flags); - if(co_cpp_flags) { - args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end()); - } config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags); if(co_ld_flags) { args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end()); } - // TODO: maybe move it to separare config option like CoreCPPFLags? - args.push_back("-I"+root_intermediate); - args.push_back("-I"+root_source); - args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+noro+".d"); args.push_back("-shared"); - args.push_back("-o"); args.push_back(dp); - args.push_back(cc); + args.push_back(o); file_list_t ancestors; get_ancestors(noro,ancestors); for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) { @@ -168,15 +169,60 @@ namespace sitecing { make(aso); args.push_back(aso); } + args.push_back("-o"); args.push_back(dp); // TODO: "g++" configurable int rv = execute("g++",args,stdO,stdE); if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) - throw compile_error(CODEPOINT,"failed to compile component",noro); + // TODO:TODO: linker_error + throw compile_error(CODEPOINT,"failed to link component",noro); return; }catch(utility_no_prefix& unp) { throw konforka::exception(CODEPOINT,"component is outside of component root"); }catch(utility_no_suffix& uns) { } + // compiler targets + for(int cct=0;cct args; + config_options *co_cpp_flags = config.lookup_config(noro,config_options::flag_cpp_flags); + if(co_cpp_flags) { + args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end()); + } + // TODO: maybe move it to separare config option like CoreCPPFLags? + args.push_back("-I"+root_intermediate); + args.push_back("-I"+root_source); + args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+noro+".d"); + args.push_back("-c"); + args.push_back(cc); + args.push_back("-o"); args.push_back(o); + // TODO: "g++" configurable + int rv = execute("g++",args,stdO,stdE); + if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) + throw compile_error(CODEPOINT,"failed to compile component",noro); + return; + }catch(utility_no_affix& una) { + // do nothing, not a compiler target + } + } // preprocessor targets for(int ppt=0;ppt