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
@@ -51,12 +51,16 @@ namespace sitecing {
              */
             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.
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
@@ -112,24 +112,24 @@ namespace sitecing {
             }
         }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;
     }
@@ -144,12 +144,13 @@ namespace sitecing {
         }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);
@@ -188,12 +189,13 @@ namespace sitecing {
             // 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");
@@ -227,12 +229,13 @@ namespace sitecing {
             }
             // 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);
@@ -261,23 +264,37 @@ namespace sitecing {
                 }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()");
         }