yet another fix to handling dependencies

2 files changed, 25 insertions, 4 deletions

diff --git a/include/sitecing/component_factory.h b/include/sitecing/component_factory.h
index a208ed1..9ddf70d 100644
--- a/include/sitecing/component_factory.h
+++ b/include/sitecing/component_factory.h
@@ -33,48 +33,52 @@ namespace sitecing {
              */
             string root_so;
             /**
              * Reference to the configuration container.
              */
             configuration& config;
 
             /**
              * @param c reference to the configuration container.
              */
             component_factory(configuration& c);
 
             /**
              * @overload file_factory::get_dependencies()
              */
             virtual void get_dependencies(const string& dst,file_list_t& deps);
             /**
              * @overload file_factory::is_uptodate()
              */
             virtual bool is_uptodate(const string& dst,file_list_t *deps=NULL);
             /**
              * @overload file_factory::build()
              */
             virtual void build(const string& dst);
+            /**
+             * @overload file_factory::make()
+             */
+            virtual void make(const string& dst);
 
             /**
              * Helper function for executing external command.
              * @param cmd the command to execute.
              * @param args the command line arguments.
              * @param stdo stdout for the child process.
              * @param stde stderr for the child process.
              * @return exit code.
              */
             int execute(const string& cmd,const list<string>& args,int stdo,int stde);
             /**
              * Fetch the class name of the component.
              * @param component the component.
              * @return the class name.
              */
             string get_classname(const string& component);
             /**
              * Get the components from which the target component has been
              * derived.
              * @param component the target component
              * @param rv where to store the list of ancestors.
              */
             void get_ancestors(const string& component,file_list_t &rv);
     };
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index 5c18bb7..b5e95af 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -94,208 +94,225 @@ namespace sitecing {
                     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+nos,str));
                             }
                         }
                     }
                     // XXX: intermediate_deps should be broken down
                     config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
                     if(co_intermediate_deps) {
                         for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
                             deps.push_back(*i);
                     }
                 }catch(utility_no_suffix& uns) { }
             }
         }catch(utility_no_prefix& unp) { }
     }
 
     bool component_factory::is_uptodate(const string& dst,file_list_t *deps) {
         string dp = normalize_path(dst,strip_trailing_slash);
-        // XXX: or just compare it off, instead of throwing things around.
         try {
             string noro = strip_prefix(dp,root_intermediate);
             for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
                 try {
                     string nos = strip_suffix(noro,pp_targets[ppt]);
                     return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps);
                 }catch(utility_no_suffix& uns) { }
             }
             bool rv =  file_factory::is_uptodate(dst,deps);
             return rv;
         }catch(utility_no_prefix& unp) { }
+        // XXX: or just compare it off, instead of throwing things around.
         try {
             strip_prefix(dp,root_so);
             return file_factory::is_uptodate(dst,deps);
         }catch(utility_no_prefix& unp) { }
         return true;
     }
 
     void component_factory::build(const string& dst) {
         string dp = normalize_path(dst,strip_trailing_slash);
         // sources
         try {
             string noro = strip_prefix(dp,root_source);
             // building the sources is left up to developer
             return;
         }catch(utility_no_prefix& unp) { }
         // .so files
         try {
             string noso = strip_suffix(dp,".so");
             string noro = strip_prefix(noso,root_so);
             string o = root_intermediate+noro+".o";
+            cerr << "Linking " << noro << endl;
             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);
             file_lock lock_cc(root_intermediate+noro+".o.lock");
             file_lock lock_so(root_so+noro+".so.lock");
             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 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 linker stderr");
             }
             list<string> args;
             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());
             }
             args.push_back("-shared");
             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) {
                 string aso=root_so+*i+".so";
                 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 link_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) { }
         try {
             string noro = strip_prefix(dp,root_intermediate);
             // compiler targets
             for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
                 try {
                     string nos = strip_suffix(noro,cc_targets[cct]);
                     string cc = root_intermediate+nos+".cc";
                     string o = root_intermediate+nos+".o";
+                    cerr << "Compiling " << nos << endl;
                     if(access(cc.c_str(),R_OK))
                         throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")");
                     make_path(dir_name(cc),0755);
                     string pwd = dir_name(root_source+nos);
                     auto_chdir dir_changer(pwd);
                     file_lock lock_source(root_intermediate+nos+".lock");
                     file_lock lock_cc(root_intermediate+nos+".o.lock");
                     int stdO = open((root_intermediate+nos+".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+nos+".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");
                     }
                     list<string> args;
                     config_options *co_cpp_flags = config.lookup_config(nos,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+nos+".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",nos);
                     return;
                 }catch(utility_no_suffix& uns) { }
             }
             // preprocessor targets
             for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
                 try {
                     string nos = strip_suffix(noro,pp_targets[ppt]);
                     string src = root_source+nos;
+                    cerr << "Preprocessing " << nos << endl;
                     if(access(src.c_str(),R_OK))
                         throw konforka::exception(CODEPOINT,string("can't access component source (")+src+")");
                     make_path(dir_name(root_intermediate+nos),0755);
                     file_lock lock(root_intermediate+nos+".lock");
                     sitecing_parser parser(*this);
                     config_options *co_skeleton = config.lookup_config(nos,config_options::flag_skeleton);
                     if(co_skeleton)
                         parser.skeleton = co_skeleton->skeleton;
                     static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
                     parser.class_name = normalize_path(nos,strip_leading_slash|strip_trailing_slash);
                     for(string::size_type illc = parser.class_name.find_first_not_of(id_chars);illc!=string::npos;illc=parser.class_name.find_first_not_of(id_chars,illc)) {
                         string::size_type lc = parser.class_name.find_first_of(id_chars,illc);
                         int n = ((lc==string::npos)?parser.class_name.length():lc)-illc;
                         parser.class_name.replace(illc,n,n,'_');
                     }
                     parser.class_name = "_SCC_"+parser.class_name;
                     parser.output_basename = root_intermediate+nos;
                     parser.component_basename = nos;
                     try {
                         parser.preprocess(src);
                         string sf = root_intermediate+nos+".pp_stamp";
                         ofstream sfs(sf.c_str(),ios::trunc|ios::out); // touch .pp_stamp
                     }catch(preprocessor_error& pe) {
                         pe.component_name = nos;
                         pe.see(CODEPOINT);
                         throw;
                     }
                     return;
                 }catch(utility_no_suffix& uns) { }
             }
         }catch(utility_no_prefix& unp) { }
         cerr << "ignoring build request for " << dp << endl;
     }
 
+    void component_factory::make(const string& dst) {
+        string dp = normalize_path(dst,strip_trailing_slash);
+        try {
+            string noso = strip_suffix(dp,".so");
+            string noro = strip_prefix(noso,root_so);
+            file_list_t a;
+            get_ancestors(noro,a);
+            for(file_list_t::const_iterator i=a.begin();i!=a.end();++i) {
+                make(root_so+*i+".so");
+            }
+        }catch(utility_no_affix& una) { }
+        file_factory::make(dst);
+    }
+
     int component_factory::execute(const string& cmd, const list<string>& args,int stdo,int stde) {
         // XXX: is it right that we do stdio/stderr tricks outside of the function?
-        cerr << "executing: " << cmd;
+        // cerr << "executing: " << cmd;
         vector<const char*> argv(args.size()+2);
         argv[0]=cmd.c_str();
         int an = 1;
         for(list<string>::const_iterator i=args.begin();i!=args.end();i++) {
-            cerr << " " << *i ;
+            // cerr << " " << *i ;
             argv[an++] = i->c_str();
         }
-        cerr << endl;
+        // cerr << endl;
         argv[an++]=NULL;
         pid_t pid = vfork();
         if(pid==-1) {
             close(stdo); close(stde);
             throw konforka::exception(CODEPOINT,"failed to vfork()");
         }
         if(!pid) {
             // child
             if(dup2(stdo,1)!=1)
                 _exit(-1);
             if(dup2(stde,2)!=2)
                 _exit(-1);
             close(0);
             execvp(cmd.c_str(),(char**)&argv.front());
             _exit(-1);
         }
         // parent
         close(stdo); close(stde);
         int rv;
         if(waitpid(pid,&rv,0)<0)
             throw konforka::exception(CODEPOINT,"failed to waitpid()");
         return rv;
     }