Changeset 628 for CMT/HEAD/source

Timestamp:

Jan 11, 2013, 11:23:19 AM (11 years ago)

Author:

rybkin

Message:

See C.L. 499

Location:

CMT/HEAD/source

Files:

• cmt_generator.cxx (modified) (2 diffs)
• cmt_generator.h (modified) (1 diff)
• cmt_generators.cxx (modified) (9 diffs)
• cmt_generators.h (modified) (1 diff)
• cmt_parser.cxx (modified) (1 diff)

CMT/HEAD/source/cmt_generator.cxx

@@ -86 +86 @@
   m_HASTARGETTAG.set ("HASTARGETTAG");
   m_HASDEPENDENCIES.set ("HASDEPENDENCIES");
+  m_HASPROTOTYPES.set ("HASPROTOTYPES");
   m_ISCHECKGROUP.set ("ISCHECKGROUP");
 }
@@ -126 +127 @@
   m_HASTARGETTAG = "";
   m_HASDEPENDENCIES = "";
+  m_HASPROTOTYPES = "";
   m_ISCHECKGROUP = "";
   m_PACKINCLUDES = "";

CMT/HEAD/source/cmt_generator.h

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

CMT/HEAD/source/cmt_generators.cxx

@@ -468 +468 @@
                               const cmt_string& file_name)
 {
-  static cmt_string lib;
+  //static cmt_string lib;
   static cmt_string allsources;
   static cmt_string file;
@@ -499 +499 @@
   need_prototypes = constituent.need_prototypes;
 
+  if (constituent.need_prototypes)
+    {
+      m_HASPROTOTYPES = "has_prototypes";
+    }
+  else
+    {
+      m_HASPROTOTYPES = "has_no_prototypes";
+    }
+
   //  cout << m_TITLE << " " << m_CONSTITUENT << endl;
   CmtMessage::info (m_TITLE + " " + m_CONSTITUENT);
 
+  /*
   lib  = "$(";
   lib += m_CONSTITUENT;
   lib += "lib)";
-
+  */
   //
   // Prepare the include paths
@@ -639 +649 @@
       if (is_library)
         {
-          jar_header_fragment.copy (m_output_file, constituent.variables, 3, 
+          jar_header_fragment.copy (m_output_file, constituent.variables, 5,
                                     &m_CONSTITUENT, 
                                     &m_CONSTITUENTSUFFIX,
-                                    &m_OBJS);
+                                    &m_OBJS,
+                                    &m_PROTOTARGET,
+                                    &m_HASPROTOTYPES);
         }
       else
         {
-          java_header_fragment.copy (m_output_file, constituent.variables, 3, 
+          java_header_fragment.copy (m_output_file, constituent.variables, 5,
                                      &m_CONSTITUENT,
                                      &m_CONSTITUENTSUFFIX,
-                                     &m_OBJS);
+                                     &m_OBJS,
+                                     &m_PROTOTARGET,
+                                     &m_HASPROTOTYPES);
         }
     }
@@ -656 +670 @@
       if (is_library)
         {
-          library_header_fragment.copy (m_output_file, constituent.variables, 3,
+          library_header_fragment.copy (m_output_file, constituent.variables, 5,
                                         &m_CONSTITUENT,
                                         &m_CONSTITUENTSUFFIX,
-                                        &m_PROTOTARGET);
+                                        &m_OBJS,
+                                        &m_PROTOTARGET,
+                                        &m_HASPROTOTYPES);
         }
       else
         {
-          application_header_fragment.copy (m_output_file, constituent.variables, 3,
-                                            &m_CONSTITUENT, 
-                                            &m_CONSTITUENTSUFFIX, 
-                                            &m_PROTOTARGET);
+          application_header_fragment.copy (m_output_file, constituent.variables, 5,
+                                            &m_CONSTITUENT,
+                                            &m_CONSTITUENTSUFFIX,
+                                            &m_OBJS,
+                                            &m_PROTOTARGET,
+                                            &m_HASPROTOTYPES);
         }
     }
@@ -806 +824 @@
       if (need_dependencies)
         {
-      dependencies_fragment.copy (m_output_file, 
-                                  constituent.variables, 3,
-                                  &m_CONSTITUENT, 
-                                  &m_CONSTITUENTSUFFIX, 
-                                  &m_LINE);
+          dependencies_fragment.copy (m_output_file, 
+                                      constituent.variables, 3,
+                                      &m_CONSTITUENT, 
+                                      &m_CONSTITUENTSUFFIX, 
+                                      &m_LINE);
         }
     }
@@ -2601 +2619 @@
   constituent_fragment.set ("constituent");
   constituent_lock_fragment.set ("constituent_lock");
+  constituent_app_lib_fragment.set ("constituent_app_lib");
   check_application_header_fragment.set ("check_application_header");
 }
@@ -2612 +2631 @@
   constituent_fragment.reset ();
   constituent_lock_fragment.reset ();
+  constituent_app_lib_fragment.reset ();
   check_application_header_fragment.reset ();
 }
@@ -2738 +2758 @@
             {
             case Application:
-              m_HASDEPENDENCIES = "has_dependencies";
-              break;
             case Library:
               m_HASDEPENDENCIES = "has_dependencies";
+              m_HASPROTOTYPES = constituent.need_prototypes ? "has_prototypes" : "has_no_prototypes" ;
               break;
             case Document:
@@ -2758 +2777 @@
                                               &m_HASDEPENDENCIES,
                                               &m_HASTARGETTAG);
+            }
+          else if (constituent.type == Application ||
+                   constituent.type == Library)
+            {
+              constituent_app_lib_fragment.copy (m_output_file, constituent.variables,
+                                                 7,
+                                                 &m_PACKAGE,
+                                                 &m_CONSTITUENT, 
+                                                 &m_CONSTITUENTSUFFIX,
+                                                 &m_LINE,
+                                                 &m_HASDEPENDENCIES,
+                                                 &m_HASTARGETTAG,
+                                                 &m_HASPROTOTYPES);
             }
           else

CMT/HEAD/source/cmt_generators.h

@@ -220 +220 @@
   FragmentHandle constituent_fragment;
   FragmentHandle constituent_lock_fragment;
+  FragmentHandle constituent_app_lib_fragment;
   FragmentHandle check_application_header_fragment;
 };

CMT/HEAD/source/cmt_parser.cxx

@@ -9620 +9620 @@
         SyntaxParser::parse_requirements_line (temp, current_use);
       }
+
+    for (int i = 0; i < constituents.size (); i++)
+      {
+        const Constituent& constituent = constituents[i];
+        if (constituent.type == Document) continue;
+        const cmt_string macro_name = constituent.name + "compile_dependencies";
+        if (!Symbol::is_selected (macro_name))
+          {
+            temp = "macro_append ";
+            temp += macro_name;
+            temp += " \"";
+
+            const Symbol* deps_macro = Symbol::find (constituent.name + "_dependencies");
+            if (deps_macro != 0)
+              {
+                const cmt_string deps_value (deps_macro->resolve_macro_value ());
+                CmtSystem::cmt_string_vector words;
+                CmtSystem::split (deps_value, " \t", words);
+                for (int i = 0; i < words.size (); i++)
+                  {
+                    const cmt_string& word = words[i];
+                    const Constituent* dep = Constituent::find (word);
+                    if (dep == 0)
+                      {
+                        if (CmtMessage::active (Verbose))
+                          CmtMessage::warning
+                            (CmtError::get_error_name (CmtError::configuration_error)
+                             + ": " + word + ": non-constituent name in macro "
+                             + constituent.name + "_dependencies value");
+                        continue;
+                      }
+                    switch (dep->type)
+                      {
+                      case Application:
+                      case Library:
+                        if (dep->need_prototypes)
+                          temp += " " + word + "prototype";
+                        break;
+                      case Document:
+                        temp += " " + word;
+                        break;
+                      }
+                  }
+              }
+
+            temp += "\"";
+            
+            SyntaxParser::parse_requirements_line (temp, current_use);
+          }
+        if (constituent.need_prototypes)
+          {
+            const cmt_string macro_name = constituent.name + "prototype_dependencies";
+            if (!Symbol::is_selected (macro_name))
+              {
+                temp = "macro_append ";
+                temp += macro_name;
+                temp += " \" $(";
+                temp += constituent.name + "compile_dependencies)\"";
+            
+                SyntaxParser::parse_requirements_line (temp, current_use);
+              }
+          }
+      }
   }