Changeset 486 for CMT/HEAD

Timestamp:

Dec 17, 2008, 12:33:52 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 381

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/document_header (modified) (1 diff)
• source/cmt_generator.cxx (modified) (1 diff)
• source/cmt_generators.cxx (modified) (3 diffs)
• source/cmt_language.cxx (modified) (5 diffs)
• source/cmt_language.h (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-12-17    <rybkin@lal.in2p3.fr> 381
+        
+        * source/cmt_language.h: In class Language, replace the members
+        dependencies_options, native_dependencies with m_dependencies_options,
+        m_native_dependencies and make them private, introduce member functions
+        to retrieve the values and to setup m_native_dependencies member on demand
+        for the language(s) that is/are actually used (rather than for all known)
+        * source/cmt_language.cxx: Implement the introduced functions
+        dependencies_options and native_dependencies
+        * source/cmt_generators.cxx: Make use of Language::dependencies_options ()
+        and Language::native_dependencies () functions
+        * source/cmt_generator.cxx: In function CmtGenerator::fill_names_outputs,
+        replace parts of the sources paths (m_LINE) with standard macros, if
+        possible
+        * mgr/fragments/document_header: Improve diagnostic messages by using the
+        standard macros
+        
 2008-12-15    <rybkin@lal.in2p3.fr> 380
         

CMT/HEAD/mgr/fragments/document_header

@@ -4 +4 @@
 
 ${CONSTITUENT} :: ${OBJS}
-        @/bin/echo "------> ${CONSTITUENT} ok"
+        $(echo) "${CONSTITUENT} ok"
 
 #-- end of document_header ------

CMT/HEAD/source/cmt_generator.cxx

@@ -353 +353 @@
         }
     }
+
+  filter_path (m_LINE.value);
 }
 

CMT/HEAD/source/cmt_generators.cxx

@@ -326 +326 @@
       preproc = language.preprocessor_command;
       fragment = (is_library) ? &(language.library) : &(language.application);
-      m_DEPENDENCIESOPTS = language.dependencies_options;
+      m_DEPENDENCIESOPTS = language.dependencies_options ();
     }
   else
@@ -358 +358 @@
 
   filter_path (m_FULLNAME.value);
-  //  filter_path (m_LINE.value);
 
   CmtSystem::get_suffix (name, m_FILESUFFIX.value);
@@ -724 +723 @@
       const SourceFile& file = m_source_files[i];
       Language& language = file.language ();
-      if (!language.native_dependencies)
+      if (language == Language::null () || !language.native_dependencies ())
         {
           need_dependencies = true;

CMT/HEAD/source/cmt_language.cxx

@@ -79 +79 @@
 
       language.setup_fragments ();
-      language.setup_native_dependencies ();
     }
 }
@@ -192 +191 @@
       else if (w.substr (0, 22) == "-dependencies_options=")
         {
-          w.substr (22, language.dependencies_options);
+          w.substr (22, language.m_dependencies_options);
         }
     }
@@ -278 +277 @@
   suffixes.clear ();
   extra_output_suffixes.clear ();
-  native_dependencies = false;
-  dependencies_options = "";
+  m_native_dependencies = false;
+  m_dependencies_options = "none";
+  m_native_dependencies_set = false;
 }
 
@@ -329 +329 @@
     }
 
-  if (dependencies_options != "")
-    {
-      cout << " -dependencies_options=" << dependencies_options;
+  if (m_dependencies_options != "none")
+    {
+      cout << " -dependencies_options=" << m_dependencies_options;
     }
 
@@ -375 +375 @@
 
 /*----------------------------------------------------------*/
+bool Language::native_dependencies ()
+  /*----------------------------------------------------------*/
+{
+  setup_native_dependencies ();
+  return m_native_dependencies;
+}
+
+/*----------------------------------------------------------*/
+const cmt_string& Language::dependencies_options () const
+  /*----------------------------------------------------------*/
+{
+  static cmt_string null_string;
+
+  return m_dependencies_options == "none" ? null_string : m_dependencies_options;
+}
+
+/*----------------------------------------------------------*/
 void Language::setup_native_dependencies ()
   /*----------------------------------------------------------*/
 {
-  if (dependencies_options != "")
-    {
-      cmt_string opts (dependencies_options);
+  if (m_native_dependencies_set) return;
+  m_native_dependencies_set = true;
+
+  if (m_dependencies_options != "none")
+    {
+      cmt_string opts (m_dependencies_options);
       Symbol::expand (opts);
       if (opts != "")
         {
-          native_dependencies = true;
+          m_native_dependencies = true;
         }
-    }
-}
+      else
+        {
+          m_native_dependencies = false;
+        }
+    }
+  else
+    {
+      m_native_dependencies = false;
+    }
+
+  return;
+}

CMT/HEAD/source/cmt_language.h

@@ -36 +36 @@
   bool operator == (const Language& other) const;
   bool operator != (const Language& other) const;
-  void setup_native_dependencies ();
+  bool native_dependencies ();
+  const cmt_string& dependencies_options () const;
 
   cmt_string m_name;
@@ -46 +47 @@
   CmtSystem::cmt_string_vector suffixes;
   CmtSystem::cmt_string_vector extra_output_suffixes;
-  bool native_dependencies;
-  cmt_string dependencies_options;
 
   FragmentHandle application;
   FragmentHandle library;
+
+private:
+  void setup_native_dependencies ();
+
+  bool m_native_dependencies;
+  cmt_string m_dependencies_options;
+  bool m_native_dependencies_set;
 };