Changeset 459 for CMT/HEAD/source/cmt_triggers.cxx

Timestamp:

May 30, 2008, 4:52:11 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 360

File:

• CMT/HEAD/source/cmt_triggers.cxx (modified) (8 diffs)

CMT/HEAD/source/cmt_triggers.cxx

@@ -25 +25 @@
 #include "cmt_constituent.h"
 #include "cmt_syntax.h"
+#include "cmt_log.h"
 
 //--------------------------------------------------
@@ -248 +249 @@
   if (pos == 0)
     {
+      CmtMessage::error ("Syntax in trigger file : empty name");
+      /*
       if (!Cmt::get_quiet ())
         {
           cerr << "Syntax error in trigger file : empty name" << endl;
         }
+      */
       exit (0);
     }
   if (pos == cmt_string::npos)
     {
+      CmtMessage::error ("Syntax in trigger file : no = sign");
+      /*
       if (!Cmt::get_quiet ())
         {
           cerr << "Syntax error in trigger file : no = sign" << endl;
         }
+      */
       exit (0);
     }
@@ -297 +304 @@
   else
     {
+      CmtMessage::error ("Syntax in trigger file : bad keyword (" + name + ")");
+      /*
       if (!Cmt::get_quiet ())
         {
@@ -302 +311 @@
             name << ")" << endl;
         }
+      */
       exit (0);
     }
@@ -418 +428 @@
   if ((pos == 0) || (pos == cmt_string::npos))
     {
+      CmtMessage::error ("Syntax in dependency file: " + line
+                         + ": Missing = or target name.");
+      /*
       if (!Cmt::get_quiet ())
         {
@@ -423 +436 @@
           cerr << "  Missing = or target name." << endl;
         }
+      */
       exit (1);
     }
@@ -447 +461 @@
   if (dependencies == "") 
     {
-      cerr << "#CMT> Warning: It seems there is nothing after \'=\' "
-        "in dependency file " << m_file_name << endl;
+      CmtMessage::warning ("It seems there is nothing after \'=\' "
+                           "in dependency file " + m_file_name);
+      //      cerr << "#CMT> Warning: It seems there is nothing after \'=\' "
+      //        "in dependency file " << m_file_name << endl;
       return;
     }
@@ -831 +847 @@
   if (analyzer->run (file_name) == Awk::failed)
     {
-      cerr << "  File " << file_name << " not found" << endl;
+      CmtMessage::warning (" File " + file_name + " not found");
+      //      cerr << "  File " << file_name << " not found" << endl;
     }