Changeset 467 for CMT

Timestamp:

Sep 24, 2008, 11:30:23 AM (16 years ago)

Author:

rybkin

Message:

See C.L. 368

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_generator.cxx (modified) (5 diffs)
• source/cmt_log.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-09-24    <rybkin@lal.in2p3.fr> 368
+        
+        * source/cmt_log.h: Introduce the Verbose level of diagnostic messages that
+        is higher than the Debug level and lower than the Info level.
+        * source/cmt_parser.cxx: Set the Verbose level of diagnostic messages if
+        the CMTVERBOSE environment variable is set to a non-empty string
+        * source/cmt_symbol.cxx: Print the message about non-existent directories
+        in path-like environment variables when the Verbose level is activated
+        * source/cmt_generator.cxx: Optimise the build_windefs function
+        
 2008-09-22    <rybkin@lal.in2p3.fr> 367
         

CMT/HEAD/source/cmt_generator.cxx

@@ -843 +843 @@
 {
   cmt_string name;
-  CmtSystem::cmt_string_vector files;
+  //  CmtSystem::cmt_string_vector files;
+  cmt_string files;
 
   for (int i = 0; i < arguments.size (); i++)
@@ -868 +869 @@
           text.replace_all ("\r", " ");
           text.replace_all ("\n", " ");
+          files += " " + text;
+          /*
           CmtSystem::cmt_string_vector words;
           CmtSystem::split (text, " \t", words);
@@ -874 +877 @@
               files.push_back (words[i]);
             }
+          */
         }
       else
-        files.push_back (w);
+        files += " " + w;
+      //        files.push_back (w);
     }
 
@@ -886 +891 @@
   if (name == "")
     {
+      CmtSystem::cmt_string_vector words;
+      CmtSystem::split (files, " \t", words);
+      if (words.size () == 0)
+        {
+          CmtMessage::error ("build_windefs: no files specified");
+          return;
+        }
       cmt_string suffix;
-      CmtSystem::get_dot_suffix (files[0], suffix);
-      CmtSystem::basename (files[0], suffix, name);
+      CmtSystem::get_dot_suffix (words[0], suffix);
+      CmtSystem::basename (words[0], suffix, name);
     }
   if (name == "")
@@ -908 +920 @@
   cmt_string command ("dumpbin /symbols");
   //  command += library_name;
+  /*
   for (int i = 0; i < files.size (); i++)
     {
       command += " " + files[i];
     }
+  */
+  command += " " + files;
         
   WinDefAwk filter (name);

CMT/HEAD/source/cmt_log.h

@@ -49 +49 @@
     Nil = 0,
     Debug,
+    Verbose,
     Info,
     Warning,

CMT/HEAD/source/cmt_parser.cxx

@@ -1379 +1379 @@
     {
       CmtMessage::set_level (Info);
+    }
+
+  s = CmtSystem::getenv ("CMTVERBOSE");
+  if (s != "")
+    {
+      CmtMessage::set_level (Verbose);
     }
 

CMT/HEAD/source/cmt_symbol.cxx

@@ -886 +886 @@
       if (!CmtSystem::test_directory (t))
           {
-            CmtMessage::warning ("Wrong path item " + t + " in " + name);
+            if (CmtMessage::active (Verbose))
+              CmtMessage::warning ("Non-existent directory " + t + " in " + name);
             /*
               if (Cmt::get_warnings ())