Changeset 561 for CMT/HEAD/source/cmt_parser.cxx

Timestamp:

Mar 8, 2011, 1:56:48 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 444

File:

• CMT/HEAD/source/cmt_parser.cxx (modified) (12 diffs)

CMT/HEAD/source/cmt_parser.cxx

@@ -64 +64 @@
   m_cmt_root       = "";
   m_cmt_version    = "";
+  m_use_cmt        = true;
   m_current_dir     = "";
   m_current_file_path = "";
@@ -2100 +2101 @@
       return;
     }
-  if (ap.arguments.size () > 0) 
-    {
-      set_standard_macros ();
-      Generator::build_constituent_makefile (ap.arguments);
-    }
+  set_standard_macros ();
+
+  cmt_string out, name;
+  for (int i = 0; i < ap.arguments.size (); i++)
+    {
+      const cmt_string& arg = ap.arguments[i];
+      if (arg.substr (0, 5) == "-out=")
+        arg.substr (5, out);
+      else
+        name = arg;
+    }
+
+  const Constituent* constituent = Constituent::find (name);
+  if (constituent == 0)
+    {
+      CmtError::set (CmtError::constituent_not_found, name);
+      return;
+    }
+  Generator::build_constituent_makefile (*constituent, out);
+//   if (ap.arguments.size () > 0) 
+//     {
+//       set_standard_macros ();
+//       Generator::build_constituent_makefile (ap.arguments);
+//     }
 }
 
@@ -2115 +2135 @@
       return;
     }
-  if (ap.arguments.size () == 0) return;
   set_standard_macros ();
 
   CmtSystem::cmt_string_vector files (2);
-  cmt_string  outdir, name;
+  cmt_string  out, outdir, name;
   for (int i = 0; i < ap.arguments.size (); i++)
     {
-      cmt_string arg = ap.arguments[i];
+      const cmt_string arg = ap.arguments[i];
       if (arg.substr (0, 5) == "-out=")
         {
-          arg.erase (0, 5);
-          CmtSystem::dirname (arg, outdir);
+          arg.substr (5, out);
+          CmtSystem::dirname (out, outdir);
         }
       else
@@ -2134 +2153 @@
     }
 
-  Generator::build_constituent_makefile (ap.arguments);
+  //  Generator::build_constituent_makefile (ap.arguments);
 
   const Constituent* constituent = Constituent::find (name);
   if (constituent == 0)
     {
-      // generate error
+      CmtError::set (CmtError::constituent_not_found, name);
       return;
     }
+  Generator::build_constituent_makefile (*constituent, out);
   if (!constituent->has_target_tag) return;
   //  cerr << "constituent: " << name << endl;
@@ -2252 +2272 @@
   set_standard_macros ();
 
-  Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
+  cmt_string out;
+  for (int i = 0; i < ap.arguments.size (); i++)
+    {
+      const cmt_string& arg = ap.arguments[i];
+      if (arg.substr (0, 5) == "-out=")
+        {
+          arg.substr (5, out);
+        }
+    }
+
+  Generator::build_constituents_makefile (Me.m_current_package, out);
+  //  Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
 }
 
@@ -2266 +2297 @@
 
   CmtSystem::cmt_string_vector files (2);
-  cmt_string outdir;
-  if (ap.arguments.size () > 0)
-    {
-      cmt_string arg = ap.arguments[0];
+  cmt_string out, outdir;
+  bool usecmt (true);
+  for (int i = 0; i < ap.arguments.size (); i++)
+    {
+      const cmt_string& arg = ap.arguments[i];
       if (arg.substr (0, 5) == "-out=")
         {
-          arg.erase (0, 5);
-          CmtSystem::dirname (arg, outdir);
+          arg.substr (5, out);
+          CmtSystem::dirname (out, outdir);
         }
-      else if (arg.substr (0, 8) == "-outdir=")
-        {
-          arg.erase (0, 8);
-          outdir = arg;
-        }
+      else if (arg == "-with_cmt")
+        usecmt = true;
+      else if (arg == "-without_cmt")
+        usecmt = false;
     }
   //  cerr << "outdir: " << outdir << endl;
@@ -2378 +2409 @@
     }
 
-  Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
+  Generator::build_constituents_makefile (Me.m_current_package, out);
+  //  Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
+
+  const Constituent::ConstituentVector& constituents =
+    Constituent::constituents ();
+  for (int n = 0; n < constituents.size (); n++)
+    {
+      const Constituent& constituent = constituents[n];
+      if (constituent.has_target_tag) continue;
+      Generator::build_constituent_infile (constituent, outdir, usecmt);
+    }
 }
 
@@ -6270 +6311 @@
   parse_arguments (ap);
   
-  if (Me.m_debug)
-    {
-      cout << "After parse_argument> pack=" << Me.m_current_package
-           << " Me.m_current_tag=" << Me.m_current_tag
-           << " cwd=" << CmtSystem::pwd () 
-           << " mode=" << Me.m_current_access
-           << endl;
-    }
-
-  if (Me.m_configure_error != "")
-    {
-      CmtMessage::error (Me.m_configure_error);
-      //      if (!Me.m_quiet) cerr << "#CMT> Error: " << Me.m_configure_error << endl;
-      return (CmtError::execution_error);
-    }
-
-  if (CmtError::has_pending_error ())
-    {
-      int code = CmtError::get_last_error_code ();
-      CmtError::print ();
-      //      if (!Me.m_quiet) CmtError::print ();
-      clear ();
-
-      return (code);
-    }
-
-  /*
-    Now actual requirements analysis can take place.
-
-    Extra lines or files are analysed first.
-  */
-
-  if (strlen (ap.extra_file.c_str ()) > 0) SyntaxParser::parse_requirements (ap.extra_file, (Use*) 0);
-  if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, (Use*) 0);
-
-  //
-  //  For some of the actions, the CMT package must be automatically
-  //  included
-  //
-
-  if (Me.m_debug) cout << "parser1> current_tag=" << Me.m_current_tag << endl;
-
   if (ap.help_action == action_help)
     {
-      do_help (ap);
       int code (0);
       if (CmtError::has_pending_error ())
@@ -6321 +6319 @@
           CmtError::print ();
         }
+      do_help (ap);
       return code;
-      //return (0);
-    }
+    }
+
+  if (Me.m_debug)
+    {
+      cout << "After parse_argument> pack=" << Me.m_current_package
+           << " Me.m_current_tag=" << Me.m_current_tag
+           << " cwd=" << CmtSystem::pwd () 
+           << " mode=" << Me.m_current_access
+           << endl;
+    }
+
+  if (Me.m_configure_error != "")
+    {
+      CmtMessage::error (Me.m_configure_error);
+      //      if (!Me.m_quiet) cerr << "#CMT> Error: " << Me.m_configure_error << endl;
+      return (CmtError::execution_error);
+    }
+
+  if (CmtError::has_pending_error ())
+    {
+      int code = CmtError::get_last_error_code ();
+      CmtError::print ();
+      //      if (!Me.m_quiet) CmtError::print ();
+      clear ();
+
+      return (code);
+    }
+
+  /*
+    Now actual requirements analysis can take place.
+
+    Extra lines or files are analysed first.
+  */
+
+  //  if (strlen (ap.extra_file.c_str ()) > 0) SyntaxParser::parse_requirements (ap.extra_file, (Use*) 0);
+  if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, (Use*) 0);
+
+  //
+  //  For some of the actions, the CMT package must be automatically
+  //  included
+  //
+
+  if (Me.m_debug) cout << "parser1> current_tag=" << Me.m_current_tag << endl;
+
+//   if (ap.help_action == action_help)
+//     {
+//       do_help (ap);
+//       int code (0);
+//       if (CmtError::has_pending_error ())
+//      {
+//        code = CmtError::get_last_error_code ();
+//        CmtError::print ();
+//      }
+//       return code;
+//       //return (0);
+//     }
 
   switch (Me.m_action)
@@ -6420 +6473 @@
     case action_unlock :
     case action_version :
+      if (Me.m_use_cmt)
+        {
       use_cmt ();
+        }
       //
       // Now parse the requirements file stored in ${CMTHOME}
@@ -6646 +6702 @@
         bool w = Me.m_warnings;
         Me.m_warnings = false;
-        reach_current_package ();
+        if (strlen (ap.extra_file.c_str ()) == 0)
+          reach_current_package ();
+        else
+          use_extra_file (ap.extra_file);
         use_user_context_requirements ();
         Me.m_warnings = w;
@@ -7764 +7823 @@
 }
 
+//----------------------------------------------------------
+int Cmt::use_extra_file (const cmt_string& file)
+{
+  if (!CmtSystem::test_file (file))
+    {
+      CmtError::set (CmtError::path_not_found, file);
+      return 0;
+    }
+
+  // (almost) Cmt::reach_current_package ()
+  Use& use = Use::current ();
+  /*
+    Try to access the package.
+  */
+
+  if (Me.m_current_package == "cmt_standalone")
+    {
+      if ((Me.m_current_path != "") && (Me.m_current_path != CmtSystem::pwd ()))
+        {
+          if (!CmtSystem::cd (Me.m_current_path))
+            {
+              CmtError::set (CmtError::package_not_found,
+                             "ReachCurrentPackage> Cannot reach the path directory");
+              return (0);
+            }
+        }
+      /*
+      if (!CmtSystem::test_file ("requirements"))
+        {
+          return (0);
+        }
+      */
+      Me.m_current_structuring_style = without_version_directory;
+    }
+  else if (Me.m_current_package != "")
+    {
+      if (!use.move_to () && !use.move_to ("", true))
+        //      if (!use.move_to ())
+        {
+          CmtError::set (CmtError::package_not_found,
+                         "ReachCurrentPackage> Cannot reach the path directory");
+          //          return -1;
+          return (0);
+        }
+
+      Me.m_current_path = use.real_path;
+    }
+  else
+    {
+      //
+      // The cmt command has been given without explicit search for 
+      // a package. Thus it is expected that we are in the context of a
+      // true package.
+      //
+      //  This means that there should be a requirements file visible.
+      //
+      //  If this is not true, we'll make a try into ../cmt and then
+      // a last try into ../mgr
+      //
+
+      //...
+    }
+
+  configure_current_dir ();
+  build_prefix (Me.m_current_package, Me.m_current_prefix);
+  build_config (Me.m_current_prefix, Me.m_current_config);
+
+  /*
+    Check Tag is always set up
+  */
+
+  if (Me.m_debug) cout << "use_extra_file0> current_tag=" << Me.m_current_tag << endl;
+
+  if (Me.m_current_tag == "")
+    {
+      cmt_string env;
+
+      env = CmtSystem::getenv (Me.m_current_config);
+      if (env != "")
+        {
+          Tag* tag;
+
+          tag = Tag::add (env, PriorityConfig, "reach current package", 0);
+          tag->mark ();
+          //Me.m_current_tag = env;
+
+          //if (!Me.m_quiet) cerr << "use_extra_file1> current_tag=" << Me.m_current_tag << endl;
+
+        }
+    }
+
+  if (Me.m_debug)
+    {
+      cout << "pwd = " << CmtSystem::pwd () << endl;
+    }
+
+  /*
+    Work on the requirements file.
+  */
+
+  SyntaxParser::parse_requirements (file, &use);
+
+  if (Me.m_debug) cout << "use_extra_file2> current_tag=" << Me.m_current_tag << endl;
+
+  /**
+   *   It would be useful to change this mechanism. Instead of
+   *  applying all global patterns at once to all use contexts, it
+   *  would be much better to apply it at the end of each
+   *  requirements file parsing, and only in the context the
+   *  appropriate Use.
+   *
+   *   This would avoid the current flaw which is that when a global
+   *  pattern specifies a "private" definition, it is actually
+   *  applied in the scope context of the Current Use and not in
+   *  each individual Use. Therefore the private is lost.
+   *
+   *   However, this induces problems since some pattern definitions
+   *  are done AFTER the use statements, which will NOT receive the
+   *  pattern aplications.
+   *
+   *   Therefore it is decided to leave this "bad" mechanism until
+   *  everybody is aware of this constraint.
+   *
+   * 
+   */
+  Pattern::apply_all_globals ();
+
+  /*
+    Select all possible tags
+  */
+
+  Tag::restore_tree ();
+
+  return (1);
+}
+
+//----------------------------------------------------------
 static cmt_string get_best_form (const CmtSystem::cmt_string_vector& pwd,
                                  const cmt_string& path)