Changeset 588 for CMT/HEAD/source/cmt_deps_builder.cxx

Timestamp:

Nov 27, 2011, 4:36:15 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 465

File:

• CMT/HEAD/source/cmt_deps_builder.cxx (modified) (12 diffs)

CMT/HEAD/source/cmt_deps_builder.cxx

@@ -11 +11 @@
 #include "cmt_symbol.h"
 #include "cmt_log.h"
+#include "cmt_error.h"
 
 //
@@ -92 +93 @@
         {
           cmt_string stamp_file;
+          log << "|header_file_action> header " << header_file_path << " against stamp " << stamp_file << log_endl;
           if (header_filters[i].use_stamp (header_file_path, stamp_file))
             {
@@ -113 +115 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
   cmt_string text;
-  text.read (header_file_path);
+  if (!text.read (header_file_path))
+    {
+      CmtError::set (CmtError::file_access_error, header_file_path);
+      return;
+    }
   char* ptr = &text[0];
   cmt_string new_dir;
@@ -725 +731 @@
     {
       cmt_string text;
-      text.read (full_name);
+      if (!text.read (full_name))
+        {
+          CmtError::set (CmtError::file_access_error, full_name);
+          return -2;
+        }
       char* ptr = &text[0];
       cmt_string new_dir;
@@ -746 +756 @@
     {
       log << "CMT> build_deps3" << log_endl;
+      CmtError::set (CmtError::path_not_found, name);
     }
   return path_index;
@@ -811 +822 @@
 
 //--------------------------------------------------------------------------
+DepsBuilder::DepsBuilder ()
+{ }
+
+//--------------------------------------------------------------------------
+DepsBuilder::~DepsBuilder ()
+{
+  clear ();
+}
+
+//--------------------------------------------------------------------------
 void DepsBuilder::clear ()
 {
@@ -820 +841 @@
     }
   m_header_filters.clear ();
+  m_deps.clear ();
+  m_all_deps.clear ();
 }
 
@@ -829 +852 @@
       return;
     }
+
+  cmt_string p = path;
   if (path[path.size () - 1] == CmtSystem::file_separator ())
     {
-      cmt_string p = path;
-      p.erase (path.size () - 1);
-      m_include_paths.push_back (p);
-    }
-  else
-    {
-      m_include_paths.push_back (path);
-    }
-
+      p = path.substr(0, path.size () - 1);
+    }
+  for (int k = m_include_paths.size () - 1; k >= 0; k--)
+    if (m_include_paths[k] == p)
+      {
+        return;
+      }
+  
+  m_include_paths.push_back (p);
   m_substitutions.push_back (substitution);
 }
@@ -919 +944 @@
 
 //--------------------------------------------------------------------------
-CmtSystem::cmt_string_vector& DepsBuilder::run (const cmt_string& file_name)
+CmtSystem::cmt_string_vector& DepsBuilder::run (const cmt_string& file_name,
+                                                const cmt_string& constituent_name)
 {
   Log;
 
   log << "Starting deps builder on " << file_name << log_endl;
+  CmtMessage::info ("calculating dependencies for " + file_name);
 
   m_deps.clear ();
@@ -974 +1001 @@
       // missing)
       //
-      preprocessor += " ";
       macro = Symbol::find ("includes");
-      preprocessor += macro->resolve_macro_value ();
+      if (0 != macro)
+        {
+          preprocessor += " ";
+          preprocessor += macro->resolve_macro_value ();
+        }
+      macro = Symbol::find ("app_" + constituent_name + "_cppflags");
+      if (0 != macro)
+        {
+          preprocessor += " ";
+          preprocessor += macro->resolve_macro_value ();
+        }
+      macro = Symbol::find ("lib_" + constituent_name + "_cppflags");
+      if (0 != macro)
+        {
+          preprocessor += " ";
+          preprocessor += macro->resolve_macro_value ();
+        }
+      
       preprocessor += " ";
       preprocessor += file_name;
@@ -982 +1025 @@
       cmt_string output;
       
-      CmtSystem::execute (preprocessor, output);
+      int status = CmtSystem::execute (preprocessor, output);
+      if (0 != status)
+        {
+          CmtError::set (CmtError::execution_failed, preprocessor, status);
+          return m_deps;
+        }
 
       //
@@ -1041 +1089 @@
 
 //--------------------------------------------------------------------------
-void DepsBuilder::add_header_filter (const Use* use, const cmt_regexp* filter, const cmt_string& stamp)
+void DepsBuilder::add_header_filter (const Use* use, cmt_regexp* filter, const cmt_string& stamp)
 {
   add_header_filter (HeaderFilter (use, filter, stamp));