Changeset 504

Timestamp:

May 20, 2009, 4:54:39 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 399

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_pattern.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-05-20    <rybkin@lal.in2p3.fr> 399
+        
+        * source/cmt_parser.cxx: In function set_standard_macros, if the Verbose
+        level is activated, check whether the names of different packages in upper
+        case coincide and issue a warning appropriately
+        * source/cmt_pattern.cxx: In function ApplyPattern::action, add the package
+        name (and offset) to the warning message about an undefined pattern
+        
 2009-05-19    <rybkin@lal.in2p3.fr> 398
         

CMT/HEAD/source/cmt_parser.cxx

@@ -8126 +8126 @@
   Me.m_standard_macros_done = true;
 
-  Use::UsePtrVector& Uses = Use::get_ordered_uses ();
+  //  Use::UsePtrVector& Uses = Use::get_ordered_uses ();
   Use& current_use = Use::current ();
 
@@ -8133 +8133 @@
   cmt_string pwd = CmtSystem::pwd ();
 
+  /**
+   * This is a check for package names
+   */
+  if (CmtMessage::active (Verbose))
+    {
+      Use::UsePtrVector uses (Use::get_ordered_uses ());
+      uses.push_back (&current_use);
+      for (int i = uses.size () - 1; i >= 0; i--)
+        {
+          Use* use = uses[i];
+          if (use->discarded) continue;
+          if (use->m_hidden) continue;
+          if (!use->located ()) continue;
+          for (int j = i - 1; j >= 0; j--)
+            {
+              Use* use2 = uses[j];
+              if (use2->discarded) continue;
+              if (use2->m_hidden) continue;
+              if (!use2->located ()) continue;
+              if (use->prefix == use2->prefix)
+                {
+                  CmtMessage::warning (use->prefix + "ROOT, "
+                                       + use->prefix + "VERSION ill-defined: "
+                                       + use->get_package_name () + " and "
+                                       + use2->get_package_name ()
+                                       + " package name conflict");
+                }
+            }
+        }
+    }
   /**
    * This is already done in

CMT/HEAD/source/cmt_pattern.cxx

@@ -846 +846 @@
       CmtError::set (CmtError::pattern_not_found, name);
       if (CmtMessage::active (Verbose))
-        CmtMessage::warning (CmtError::get_last_error ());
+        {
+          cmt_string cmtpath, offset;
+          use->get_cmtpath_and_offset (cmtpath, offset);
+          CmtMessage::warning ((offset != "" ? offset + "/" : "")
+                               + use->get_package_name ()
+                               + ": " + CmtError::get_last_error ());
+          //CmtMessage::warning (CmtError::get_last_error ());
+        }
       return;
     }