Changeset 3 for CMT/v1r19/source/cmt_parser.cxx

Timestamp:

Mar 2, 2005, 5:39:59 PM (19 years ago)

Author:

arnault

Message:

Various improvements - Introduction of CMTPROJECTPATH - see CL251

File:

• CMT/v1r19/source/cmt_parser.cxx (modified) (7 diffs)

CMT/v1r19/source/cmt_parser.cxx

@@ -1961 +1961 @@
 void Cmt::do_check_configuration (const ArgParser& ap)
 {
+  cmt_string env;
+  Tag* tag;
+
+  static CmtSystem::cmt_string_vector tags;
+
+  CmtSystem::split (Me.m_extra_tags, " \t,", tags);
+
+  for (int i = 0; i < tags.size (); i++)
+    {
+      const cmt_string& t = tags[i];
+
+      tag = Tag::find (t);
+      if (tag == 0) continue;
+
+      if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+        {
+          cerr << "#CMT> The tag " << t << " is not used in any tag expression. Please check spelling" << endl;
+        }
+    }
+
+  env = CmtSystem::getenv ("CMTSITE");
+  if (env == "") 
+    {
+      return;
+    }
+
+  tag = Tag::find (env);
+  if (tag == 0) 
+    {
+      return;
+    }
+
+  if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+    {
+      cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl;
+    }
+
+  env = CmtSystem::getenv ("CMTCONFIG");
+  if (env == "")
+    {
+      return;
+    }
+
+  tag = Tag::find (env);
+  if (tag == 0) 
+    {
+      return;
+    }
+
+  if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+    {
+      cerr << "#CMT> The CMTCONFIG value " << env << " is not used in any tag expression. Please check spelling" << endl;
+    }
 }
 
@@ -2454 +2507 @@
         {
           Me.m_action = action_show_action_names;
+          /*
           if (!Me.m_quiet)
             {
@@ -2459 +2513 @@
               print_symbol_names (ap.mode);
             }
-          CmtError::set (CmtError::symbol_not_found, ap.arguments[0]);
+          */
+          CmtError::set (CmtError::unknown_command, ap.arguments[0]);
           return;
         }
@@ -2986 +3041 @@
 void Cmt::do_setup (const ArgParser& ap)
 {
+
+  do_check_configuration (ap);
+
   print (ap.mode);
 
@@ -3866 +3924 @@
             {
               //this directory should become the first entry of the CMTPATH
+
+              IProjectFactory& factory = ProjectFactory::instance ();
+              factory.create_project (pwd, "CurrentProject");
+
+              /*
               cmt_string temp = "path_prepend CMTPATH \"";
               temp += pwd;
@@ -3873 +3936 @@
 
               SyntaxParser::parse_requirements_line (temp, &use);
-              
+              */
+
               break;
             }
@@ -3890 +3954 @@
       CmtSystem::cd (Me.m_current_dir);
     }
+
+  cmt_string buffer = "path CMTPATH \n";
+  Project::set_cmtpaths (buffer);
+  //cerr << "buffer = " << buffer << endl;
+  Use& use = Use::current();
+  SyntaxParser::parse_requirements_text (buffer, "", &use);
 }