summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/sitecing/sitecing_exception.h29
-rw-r--r--lib/component_factory.cc3
2 files changed, 30 insertions, 2 deletions
diff --git a/include/sitecing/sitecing_exception.h b/include/sitecing/sitecing_exception.h
index bf475ac..cb5edd9 100644
--- a/include/sitecing/sitecing_exception.h
+++ b/include/sitecing/sitecing_exception.h
@@ -8,12 +8,40 @@
8 * @brief The site-C-ing specific exception. 8 * @brief The site-C-ing specific exception.
9 */ 9 */
10 10
11namespace sitecing { 11namespace sitecing {
12 12
13 /** 13 /**
14 * The comonent failed to link.
15 */
16 class link_error : public konforka::exception {
17 public:
18 /**
19 * The component path
20 */
21 string component_path;
22
23 /**
24 * @param w the message.
25 * @param cp component path.
26 */
27 link_error(const string& w,const string& cp)
28 : konforka::exception(NOCODEPOINT,w), component_path(cp) { }
29 /**
30 * @param fi the file name where the exception is thrown from.
31 * @param fu the function name where the exception originates from.
32 * @param l the line number where the exception originates from.
33 * @param w the message.
34 * @param cp component path.
35 */
36 link_error(const string& fi,const string& fu,int l,const string& w,const string& cp)
37 : konforka::exception(fi,fu,l,w), component_path(cp) { }
38 ~link_error() throw() { }
39 };
40
41 /**
14 * The component failed to compile. 42 * The component failed to compile.
15 */ 43 */
16 class compile_error : public konforka::exception { 44 class compile_error : public konforka::exception {
17 public: 45 public:
18 /** 46 /**
19 * The component path 47 * The component path
@@ -34,12 +62,13 @@ namespace sitecing {
34 compile_error(const string &whe,const string& wha,const string& cp) 62 compile_error(const string &whe,const string& wha,const string& cp)
35 : konforka::exception(whe,wha), component_path(cp) { } 63 : konforka::exception(whe,wha), component_path(cp) { }
36 /** 64 /**
37 * @param fi the file name where the exception is thrown from. 65 * @param fi the file name where the exception is thrown from.
38 * @param fu the function name where the exception originates from. 66 * @param fu the function name where the exception originates from.
39 * @param l the line number where the exception originates from. 67 * @param l the line number where the exception originates from.
68 * @param w the message.
40 * @param cp component path. 69 * @param cp component path.
41 */ 70 */
42 compile_error(const string &fi,const string& fu,int l,const string& w,const string& cp) 71 compile_error(const string &fi,const string& fu,int l,const string& w,const string& cp)
43 : konforka::exception(fi,fu,l,w), component_path(cp) { } 72 : konforka::exception(fi,fu,l,w), component_path(cp) { }
44 ~compile_error() throw() { } 73 ~compile_error() throw() { }
45 }; 74 };
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
@@ -169,14 +169,13 @@ namespace sitecing {
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);