Changeset 637 for CMT/v1r25-branch/source/cmt_generators.cxx

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_generators.cxx (modified) (7 diffs)

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);
             }
         }