summaryrefslogtreecommitdiffabout
path: root/lib
Unidiff
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/component_factory.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index a5ced6b..2a2eefe 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -127,98 +127,97 @@ namespace sitecing {
127 }catch(utility_no_prefix& unp) { } 127 }catch(utility_no_prefix& unp) { }
128 return true; 128 return true;
129 } 129 }
130 130
131 void component_factory::build(const string& dst) { 131 void component_factory::build(const string& dst) {
132 string dp = normalize_path(dst,strip_trailing_slash); 132 string dp = normalize_path(dst,strip_trailing_slash);
133 // sources 133 // sources
134 try { 134 try {
135 string noro = strip_prefix(dp,root_source); 135 string noro = strip_prefix(dp,root_source);
136 // building the sources is left up to developer 136 // building the sources is left up to developer
137 return; 137 return;
138 }catch(utility_no_prefix& unp) { } 138 }catch(utility_no_prefix& unp) { }
139 // .so files 139 // .so files
140 try { 140 try {
141 string noso = strip_suffix(dp,".so"); 141 string noso = strip_suffix(dp,".so");
142 string noro = strip_prefix(noso,root_so); 142 string noro = strip_prefix(noso,root_so);
143 string o = root_intermediate+noro+".o"; 143 string o = root_intermediate+noro+".o";
144 if(access(o.c_str(),R_OK)) 144 if(access(o.c_str(),R_OK))
145 throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")"); 145 throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")");
146 make_path(dir_name(root_so+noro),0755); 146 make_path(dir_name(root_so+noro),0755);
147 file_lock lock_cc(root_intermediate+noro+".o.lock"); 147 file_lock lock_cc(root_intermediate+noro+".o.lock");
148 file_lock lock_so(root_so+noro+".so.lock"); 148 file_lock lock_so(root_so+noro+".so.lock");
149 int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 149 int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
150 if(stdO<0) 150 if(stdO<0)
151 throw konforka::exception(CODEPOINT,"failed to open/create linker stdout"); 151 throw konforka::exception(CODEPOINT,"failed to open/create linker stdout");
152 int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 152 int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
153 if(stdE<0) { 153 if(stdE<0) {
154 close(stdO); 154 close(stdO);
155 throw konforka::exception(CODEPOINT,"failed to open/create linker stderr"); 155 throw konforka::exception(CODEPOINT,"failed to open/create linker stderr");
156 } 156 }
157 list<string> args; 157 list<string> args;
158 config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags); 158 config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags);
159 if(co_ld_flags) { 159 if(co_ld_flags) {
160 args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end()); 160 args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end());
161 } 161 }
162 args.push_back("-shared"); 162 args.push_back("-shared");
163 args.push_back(o); 163 args.push_back(o);
164 file_list_t ancestors; 164 file_list_t ancestors;
165 get_ancestors(noro,ancestors); 165 get_ancestors(noro,ancestors);
166 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) { 166 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) {
167 string aso=root_so+*i+".so"; 167 string aso=root_so+*i+".so";
168 make(aso); 168 make(aso);
169 args.push_back(aso); 169 args.push_back(aso);
170 } 170 }
171 args.push_back("-o"); args.push_back(dp); 171 args.push_back("-o"); args.push_back(dp);
172 // TODO: "g++" configurable 172 // TODO: "g++" configurable
173 int rv = execute("g++",args,stdO,stdE); 173 int rv = execute("g++",args,stdO,stdE);
174 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) 174 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
175 // TODO:TODO: linker_error 175 throw link_error(CODEPOINT,"failed to link component",noro);
176 throw compile_error(CODEPOINT,"failed to link component",noro);
177 return; 176 return;
178 }catch(utility_no_prefix& unp) { 177 }catch(utility_no_prefix& unp) {
179 throw konforka::exception(CODEPOINT,"component is outside of component root"); 178 throw konforka::exception(CODEPOINT,"component is outside of component root");
180 }catch(utility_no_suffix& uns) { } 179 }catch(utility_no_suffix& uns) { }
181 try { 180 try {
182 string noro = strip_prefix(dp,root_intermediate); 181 string noro = strip_prefix(dp,root_intermediate);
183 // compiler targets 182 // compiler targets
184 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) { 183 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
185 try { 184 try {
186 string nos = strip_suffix(noro,cc_targets[cct]); 185 string nos = strip_suffix(noro,cc_targets[cct]);
187 string cc = root_intermediate+nos+".cc"; 186 string cc = root_intermediate+nos+".cc";
188 string o = root_intermediate+nos+".o"; 187 string o = root_intermediate+nos+".o";
189 if(access(cc.c_str(),R_OK)) 188 if(access(cc.c_str(),R_OK))
190 throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")"); 189 throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")");
191 make_path(dir_name(cc),0755); 190 make_path(dir_name(cc),0755);
192 string pwd = dir_name(root_source+nos); 191 string pwd = dir_name(root_source+nos);
193 auto_chdir dir_changer(pwd); 192 auto_chdir dir_changer(pwd);
194 file_lock lock_source(root_intermediate+nos+".lock"); 193 file_lock lock_source(root_intermediate+nos+".lock");
195 file_lock lock_cc(root_intermediate+nos+".o.lock"); 194 file_lock lock_cc(root_intermediate+nos+".o.lock");
196 int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 195 int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
197 if(stdO<0) 196 if(stdO<0)
198 throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout"); 197 throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout");
199 int stdE = open((root_intermediate+nos+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 198 int stdE = open((root_intermediate+nos+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
200 if(stdE<0) { 199 if(stdE<0) {
201 close(stdO); 200 close(stdO);
202 throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr"); 201 throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr");
203 } 202 }
204 list<string> args; 203 list<string> args;
205 config_options *co_cpp_flags = config.lookup_config(nos,config_options::flag_cpp_flags); 204 config_options *co_cpp_flags = config.lookup_config(nos,config_options::flag_cpp_flags);
206 if(co_cpp_flags) { 205 if(co_cpp_flags) {
207 args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end()); 206 args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end());
208 } 207 }
209 // TODO: maybe move it to separare config option like CoreCPPFLags? 208 // TODO: maybe move it to separare config option like CoreCPPFLags?
210 args.push_back("-I"+root_intermediate); 209 args.push_back("-I"+root_intermediate);
211 args.push_back("-I"+root_source); 210 args.push_back("-I"+root_source);
212 args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+nos+".d"); 211 args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+nos+".d");
213 args.push_back("-c"); 212 args.push_back("-c");
214 args.push_back(cc); 213 args.push_back(cc);
215 args.push_back("-o"); args.push_back(o); 214 args.push_back("-o"); args.push_back(o);
216 // TODO: "g++" configurable 215 // TODO: "g++" configurable
217 int rv = execute("g++",args,stdO,stdE); 216 int rv = execute("g++",args,stdO,stdE);
218 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) 217 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
219 throw compile_error(CODEPOINT,"failed to compile component",nos); 218 throw compile_error(CODEPOINT,"failed to compile component",nos);
220 return; 219 return;
221 }catch(utility_no_suffix& uns) { } 220 }catch(utility_no_suffix& uns) { }
222 } 221 }
223 // preprocessor targets 222 // preprocessor targets
224 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) { 223 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {