Changeset 637 for CMT/v1r25-branch/source

Timestamp:

Jun 6, 2013, 2:43:50 PM (11 years ago)

Author:

rybkin

Message:

merge -r 618:627 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_constituent.cxx (modified) (1 diff)
• source/cmt_generator.cxx (modified) (2 diffs)
• source/cmt_generator.h (modified) (1 diff)
• source/cmt_generators.cxx (modified) (7 diffs)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_std.h (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (7 diffs)

CMT/v1r25-branch/source/cmt_constituent.cxx

@@ -176 +176 @@
     else if (w == "-check")
       {
-        m_constituent.need_check = true;
+        if (m_constituent.type == Application)
+          {
+            m_constituent.need_check = true;
+          }
       }
     else if (w == "-triggers")

CMT/v1r25-branch/source/cmt_generator.cxx

@@ -86 +86 @@
   m_HASTARGETTAG.set ("HASTARGETTAG");
   m_HASDEPENDENCIES.set ("HASDEPENDENCIES");
+  m_ISCHECKGROUP.set ("ISCHECKGROUP");
 }
 
@@ -125 +126 @@
   m_HASTARGETTAG = "";
   m_HASDEPENDENCIES = "";
+  m_ISCHECKGROUP = "";
   m_PACKINCLUDES = "";
   m_PACKOS9      = false;

CMT/v1r25-branch/source/cmt_generator.h

@@ -133 +133 @@
   Variable m_HASTARGETTAG;
   Variable m_HASDEPENDENCIES;
+  Variable m_ISCHECKGROUP;
 };
 

CMT/v1r25-branch/source/cmt_generators.cxx

@@ -1114 +1114 @@
     {
       FragmentHandle header_fragment (header);
-      header_fragment.copy (m_output_file, constituent.variables, 3, 
+      header_fragment.copy (m_output_file, constituent.variables, 4, 
                             &m_CONSTITUENT,
                             &m_CONSTITUENTSUFFIX,
-                            &m_OBJS);
+                            &m_OBJS,
+                            &m_LINE);
     }
   else
@@ -1183 +1184 @@
       SourceFile& file = m_source_files[i];
       const cmt_string& file_name = file.name ();
+      m_OUTPUTNAME = file.output ();
       m_FULLNAME = file_name;
       CmtSystem::get_dot_suffix (file_name, suffix);
@@ -1193 +1195 @@
       m_FILESUFFIX.value = suffix;
       //CmtSystem::get_dot_suffix (m_FILENAME.value, m_FILESUFFIX.value);
-      CmtSystem::get_suffix (m_FILENAME.value, m_FILEEXTENSION .value);
+      CmtSystem::get_suffix (m_FILENAME.value, m_FILEEXTENSION.value);
       /*
       if (!CmtSystem::test_file (file_name) && !CmtSystem::test_directory (file_name))
@@ -1206 +1208 @@
           // ensure that ${CONSTITUENT}_dependencies.make gets rebuilt
           // whenever source file OR its dependencies change
-          if (!dependency_fragment.copy (m_output_file, constituent.variables, 9,
+          if (!dependency_fragment.copy (m_output_file, constituent.variables, 10,
                                          &m_FILEPATH,
                                          &m_SUFFIX,
+                                         &m_OUTPUTNAME,
                                          &m_CONSTITUENT,
                                          &m_CONSTITUENTSUFFIX,
@@ -1218 +1221 @@
         }
       
-      fragment.copy (m_output_file, constituent.variables, 9,
+      fragment.copy (m_output_file, constituent.variables, 10,
                      &m_FILEPATH,
                      &m_SUFFIX,
+                     &m_OUTPUTNAME,
                      &m_CONSTITUENT,
                      &m_CONSTITUENTSUFFIX,
@@ -1234 +1238 @@
     {
       FragmentHandle trailer_fragment (trailer);
-      trailer_fragment.copy (m_output_file, constituent.variables, 3, 
+      trailer_fragment.copy (m_output_file, constituent.variables, 4, 
                              &m_CONSTITUENT,
                              &m_CONSTITUENTSUFFIX,
-                             &m_OBJS);
+                             &m_OBJS,
+                             &m_LINE);
     }
 
@@ -2768 +2773 @@
           if (constituent.need_check)
             {
+              if (constituent.group != 0 && 
+                  constituent.group->name () == "check")
+                m_ISCHECKGROUP = "is_check_group";
+              else
+                m_ISCHECKGROUP = "is_not_check_group";
+
               check_application_header_fragment.copy (m_output_file, 
-                                                      constituent.variables, 3,
+                                                      constituent.variables, 4,
                                                       &m_PACKAGE,
                                                       &m_CONSTITUENT,
-                                                      &m_CONSTITUENTSUFFIX);
+                                                      &m_CONSTITUENTSUFFIX,
+                                                      &m_ISCHECKGROUP);
             }
         }

CMT/v1r25-branch/source/cmt_parser.cxx

@@ -9399 +9399 @@
             Use* u = imports[i];
             
+            Include::parse_all (u);
+
             u->fill_includes_macro (buffer);
             u->fill_macro (buffer, "cflags");

CMT/v1r25-branch/source/cmt_std.h

@@ -10 +10 @@
 
 #ifndef WIN32
-#ifndef linux
+#ifndef __linux__
 #ifndef __CYGWIN__
 #ifndef __APPLE__

CMT/v1r25-branch/source/cmt_symbol.cxx

@@ -223 +223 @@
 #endif
 }
+/**
+ * similar to processing
+ * `shell' function of GNU Make does
+ *  on command output
+ */
+static void process_cmd_output (cmt_string& text)
+{
+  //cerr << "process_cmd_output (begin): [" << text << "]" << endl;
+  // remove trailing (carriage-return and) newline(s)
+  int nl = text.size ();
+  while (nl > 0 && text[nl - 1] == '\n')
+    {
+      nl--;
+      if (nl > 0 && text[nl - 1] == '\r')
+        nl--;
+    }
+  if (nl != text.size ())
+    text.erase (nl);
+
+  // convert each newline (or carriage-return / newline pair) to a single space
+  text.replace_all ("\r\n", " ");
+  text.replace_all ("\n", " ");
+  //cerr << "process_cmd_output (end): [" << text << "]" << endl;
+}
 
 /**
@@ -318 +342 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -323 +348 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
-          
+          */          
+          process_cmd_output (result);
+
           if (Cmt::get_debug ())
             {
-              cout << "   Executing [" << command << "] to expand a symbol value =>[" 
+              cout << "resolve_value: Executing [" << command << "] to expand a symbol value =>[" 
                    << result << "]" << endl;
             }
@@ -462 +489 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -467 +495 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
+          */
+          process_cmd_output (result);
           
           if (Cmt::get_debug ())
@@ -596 +626 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -601 +632 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
+          */          
+          process_cmd_output (result);
           
           if (Cmt::get_debug ())