Changeset 567 for CMT/HEAD

Timestamp:

Apr 18, 2011, 5:09:27 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 450

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-04-18    <rybkin@lal.in2p3.fr> 450
+
+        * source/cmt_parser.cxx: In class Cmt, in function do_check_configuration,
+        if current use is outside CMTPATH (and action is not action_setup) issue
+        warning or set error, provided [CMT]PEDANTIC environment variable is set,
+        thus adding this check to "cmt check configuration" command
+        
 2011-04-15    <rybkin@lal.in2p3.fr> 449
 
@@ -7 +14 @@
         set_auto_imports to ensure valid uses are followed. Make use of
         is_head_version, in functions reach_package, add, of
-        alternate_is_head_versions, in function select_alternate to ensure
-        head version satisfies any request and takes priority
+        alternate_is_head_versions, in function select_alternate, to ensure
+        head version satisfies any request and takes precedence
         
 2011-04-12    <rybkin@lal.in2p3.fr> 448

CMT/HEAD/source/cmt_parser.cxx

@@ -2704 +2704 @@
 
   set_standard_macros ();
+
+  const Use& use = Use::current ();
+  if (use.located ())
+    {
+      if (action_setup != get_action () &&
+          0 == Project::find_in_cmt_paths (use.real_path).size ())
+        {
+          if (0 == CmtSystem::getenv ("CMTPEDANTIC").size () &&
+              0 == CmtSystem::getenv ("PEDANTIC").size ())
+            CmtMessage::warning
+              (CmtError::get_error_name (CmtError::configuration_error)
+               + ": Current use outside CMTPATH: " + use.get_info ());
+          else
+            CmtError::set(CmtError::configuration_error,
+                          "Current use outside CMTPATH: " + use.get_info ());
+        }
+    }
+  else
+    {
+      CmtMessage::verbose
+        (CmtError::get_error_name (CmtError::configuration_error)
+         + ": Current use not located: " + use.get_info ());
+    }
 
   static CmtSystem::cmt_string_vector tags;