Changeset 664 for CMT/v1r25-branch/source/cmt_parser.cxx

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_parser.cxx (modified) (131 diffs)

CMT/v1r25-branch/source/cmt_parser.cxx

@@ -3 +3 @@
 // arnault@lal.in2p3.fr
 // Modified by garonne@lal.in2p3.fr
+// Modified by Grigory Rybkin
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -10 +11 @@
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 //----------------------------------------------------------
@@ -50 +52 @@
 }
 
+//----------------------------------------------------------
 CmtContext::~CmtContext ()
 {
 }
 
+//----------------------------------------------------------
 void CmtContext::clear ()
 {
@@ -59 +63 @@
   m_build_nmake    = false;
   m_cmt_config     = "";
-  //m_cmt_path.clear ();
-  //m_cmt_path_pwds.clear ();
-  //m_cmt_path_sources.clear ();
   m_cmt_root       = "";
+  m_cmt_home       = "";
+  m_cmt_user_context = "";
+  m_cmt_site       = "";
   m_cmt_version    = "";
   m_use_cmt        = true;
+  m_use_projects   = true;
+
   m_current_dir     = "";
   m_current_file_path = "";
@@ -74 +80 @@
   m_current_offset  = "";
 
-  m_current_access   = DeveloperMode;
+  m_current_access  = UserMode;
+  m_current_style   = cmt_style;
+  m_current_structuring_style = default_structuring_style;
 
   m_current_tag      = "";
   m_current_target   = "";
   m_current_version  = "";
+
+  //  m_extra_tags       = "";
+  m_extra_tags.clear ();
+  m_tags.clear ();
+  m_tags_add.clear ();
+  m_tags_remove.clear ();
+
+  m_configure_error  = "";
+
+  m_debug = (::getenv ("CMTDEBUG") != 0) ? true : false;
+
   m_default_path     = "";
-
-  //m_quiet            = false;
-
+  m_quiet            = false;
   m_disable_warnings = false;
   m_warnings         = false;
@@ -91 +108 @@
 
   m_standard_macros_done = false;
-  m_current_access = UserMode;
-  m_current_style = cmt_style;
-  m_current_structuring_style = default_structuring_style;
   m_all_sets_done = false;
+
   m_autoconfigure_cmtpath = false;
-  m_debug = false;
-  if (getenv ("CMTDEBUG") != 0) m_debug = true;
-}
-
+
+  m_env_access = true;
+  m_print_mode = Csh;
+  m_strip_path = false;
+}
+//----------------------------------------------------------
+
+int CmtContext::initialize ()
+{
+  int errors (0);
+
+  cmt_string tags = CmtSystem::getenv ("CMTEXTRATAGS");
+  CmtSystem::cmt_string_vector words;
+  CmtSystem::split (tags, " \t,", words);
+  for (int i = 0; i < words.size (); i++)
+    {
+      bool has (false);
+      for (int j = 0; j < m_extra_tags.size (); j++)
+        {
+          if (m_extra_tags[j] == words[i])
+            {
+              has = true;
+              break;
+            }
+        }
+      if (!has)
+        m_extra_tags.push_back (words[i]);
+    }
+
+  return - errors;
+}
 //----------------------------------------------------------
 
@@ -357 +399 @@
 
 
+//----------------------------------------------------------
+//
+//   The static Cmt member
+//
+//----------------------------------------------------------
+
+CmtContext& Cmt::m_cmt_context = Me;
+//CmtContext * Cmt::m_cmt_context = &Me;
 
 //----------------------------------------------------------
@@ -462 +512 @@
 
 //----------------------------------------------------------
+/*
 bool Cmt::build_nmake ()
 {
   return (Me.m_build_nmake);
 }
-
+*/
 //----------------------------------------------------------
 void Cmt::build_OS9_makefile (const cmt_string& target)
@@ -497 +548 @@
 void Cmt::clear ()
 {
-  Me.m_quiet = false;
   Me.clear ();
+  //Me.m_quiet = false;
 
   Database::clear ();
@@ -507 +558 @@
 
 //----------------------------------------------------------
+namespace {
+
+bool parse_cmt_flags (const cmt_string& file_name, CmtContext& cmt)
+{
+  cmt_string Flags (Cmt::get_cmt_flags (file_name));
+  if (CmtError::get_last_error_code () == CmtError::file_access_error)
+    return false;
+  if (Flags.size () == 0)
+    return true;
+
+  cmt_string CmtFlags (Cmt::get_cmt_flags ());
+  if (CmtFlags.size () != 0)
+    Flags += " " + CmtFlags;
+
+  CmtSystem::cmt_string_vector flags;
+  CmtSystem::split (Flags, " \t", flags);
+  for (int i = 0; i < flags.size (); i++)
+    {
+      if (flags[i] == "-without_cmt" &&
+          cmt.m_use_cmt)
+        cmt.m_use_cmt = false;
+      else if (flags[i] == "-with_cmt" &&
+               !cmt.m_use_cmt)
+        cmt.m_use_cmt = true;
+      else if (flags[i] == "-without_projects" &&
+               cmt.m_use_projects)
+        cmt.m_use_projects = false;
+      else if (flags[i] == "-with_projects" &&
+               !cmt.m_use_projects)
+        cmt.m_use_projects = true;
+      else if (flags[i] == "-no_strip_path" &&
+               cmt.m_strip_path)
+        {
+          cmt.m_strip_path = false;
+          Symbol::set_strip_path (false);
+        }
+      else if (flags[i] == "-strip_path" &&
+               !cmt.m_strip_path)
+        {
+          cmt.m_strip_path = true;
+          Symbol::set_strip_path (true);
+        }
+    }
+
+  return true;
+}
+
+}
+
+//----------------------------------------------------------
 //void Cmt::configure ()
 void Cmt::configure (const ArgParser& ap)
@@ -515 +616 @@
   if (configured) return;
 
-  Me.clear ();
+  //  Me.clear ();
 
   log << "configure_cmt_message" << log_endl;
@@ -523 +624 @@
   log << "configure_default_path" << log_endl;
   configure_default_path ();
+
+  log << "restore_all_tags" << log_endl;
+  restore_all_tags (0);
   log << "configure_version_tag" << log_endl;
   configure_version_tag ();
@@ -533 +637 @@
   log << "configure_site_tag" << log_endl;
   configure_site_tag (0);
+
+  cmt_string requirements;
+
+  if (Me.m_current_package.size () != 0 &&
+      Me.m_current_package != "cmt_standalone")
+    {
+      // we have a package name (not "cmt_standalone")
+      Use& use = Use::current();
+      use.set (Me.m_current_package, 
+               Me.m_current_version, 
+               Me.m_current_path);
+      if (CmtSystem::absolute_path (Me.m_current_path))
+        {
+          if (!use.move_to ())
+            {
+              CmtError::set (CmtError::package_not_found, use.get_info ());
+              return;
+            }
+        }
+      else
+        {
+          if (!use.move_to ("", true))
+            {
+              // will try again later from CMTPATH entries
+            }
+        }
+
+      if (use.located ())
+        {
+          // parse additional options
+          parse_cmt_flags ("requirements", m_cmt_context);
+        }
+    }
+  else
+    {
+      if (Me.m_current_path.size () != 0 &&
+          !CmtSystem::cd (Me.m_current_path))
+        {
+          CmtError::set (CmtError::path_not_found, Me.m_current_path);
+          return;
+        }
+
+      configure_current_dir ();
+      configure_current_structuring_style (ap);
+      cmt_string current_package_saved (Me.m_current_package);
+      requirements = configure_current_package ();
+      Me.m_current_package = current_package_saved;
+      if (requirements.size () != 0)
+        {
+          // parse additional options
+          parse_cmt_flags (requirements, m_cmt_context);
+        }
+    }
+
   log << "configure_current_dir" << log_endl;
   configure_current_dir ();
@@ -540 +698 @@
   //  log << "configure_current_dir" << log_endl;
 
-
   bool save_quiet = Me.m_quiet;
   Me.m_quiet = true;
@@ -546 +703 @@
   Me.m_autoconfigure_cmtpath = true;
   configure_cmt_path (0);
-  Me.m_autoconfigure_cmtpath = false;
+  //  Me.m_autoconfigure_cmtpath = false;
 
   Me.m_quiet = save_quiet;
@@ -553 +710 @@
 
   guess_current_project ();
+
+  if (Me.m_current_package.size () != 0 &&
+      Me.m_current_package != "cmt_standalone")
+    {
+      Use& use = Use::current();
+      if (!use.located ())
+        {
+          if (!use.move_to ())
+            {
+              CmtError::set (CmtError::package_not_found, use.get_info ());
+              return;
+            }
+          else
+            {
+              use.get_full_path (Me.m_current_dir);
+              switch (use.style)
+                {
+                case cmt_style:
+                  Me.m_current_dir += CmtSystem::file_separator ();
+                  Me.m_current_dir += "cmt";
+                  break;
+                case mgr_style:
+                  Me.m_current_dir += CmtSystem::file_separator ();
+                  Me.m_current_dir += "mgr";
+                  break;
+                default:
+                  break;
+                }
+              Me.m_current_file_path = Me.m_current_dir;
+
+              Project::order_all ();
+              Cmt::guess_current_project ();
+            }
+        }
+    }
 
   log << "configure_current_structuring_style" << log_endl;
@@ -558 +750 @@
   configure_current_structuring_style (ap);
 
+//   if (requirements.size () == 0)
+//     {
   log << "configure_current_package" << log_endl;
   configure_current_package ();
+//     }
 
   Use& use = Use::current();
-
-  use.set (Me.m_current_package,
-           Me.m_current_version,
-           Me.m_current_path,
-           "",
-           "");
-
-  use.style = Me.m_current_style;
-  use.structuring_style = Me.m_current_structuring_style;
-
-  use.change_path (Me.m_current_path);
+  if (!use.located ())
+    {
+      use.set (Me.m_current_package,
+               Me.m_current_version,
+               Me.m_current_path);
+      use.style = Me.m_current_style;
+
+      if (use.style != none_style)
+        {
+          use.structuring_style = Me.m_current_structuring_style;
+          use.change_path (Me.m_current_path, Project::get_current ());
+        }
+      else
+        {
+          use.real_path = Me.m_current_path;
+        }
+    }
+  else if (const Project * p = Project::get_current ())
+    {
+      use.set_project (p);
+    }
 
   if (CmtError::has_pending_error ()) 
@@ -584 +789 @@
 {
   if (!Me.m_autoconfigure_cmtpath) return;
+
+  if (!m_cmt_context.m_use_projects) return;
 
   cmt_string s;
@@ -621 +828 @@
 {
   Use& current_use = Use::current ();
-
+  current_use.get_cmtpath_and_offset (Me.m_current_cmtpath, Me.m_current_offset);
+  /*
   Me.m_current_cmtpath = "";
   Me.m_current_offset = "";
@@ -633 +841 @@
 
       Me.m_current_offset = current_use.path;
-
+  */
       /**
          try to remove this current CMTPATH entry from path.  This
@@ -639 +847 @@
          absolute path.
       */
-      
+  /*      
       Me.m_current_offset.replace (Me.m_current_cmtpath, empty_string);
       if (Me.m_current_offset[0] == CmtSystem::file_separator ())
@@ -648 +856 @@
         }
     }
+  */
 }
 
@@ -731 +940 @@
 void Cmt::configure_current_dir ()
 {
+  if (Me.m_current_dir.size () != 0) return;
+
   cmt_string file_name;
 
@@ -788 +999 @@
   Me.m_current_file_path = mount_filter.get_current_dir ();
 
-  cmt_string t = Me.m_current_file_path;
-}
-
-//----------------------------------------------------------
-void Cmt::configure_current_package ()
+  //  cmt_string t = Me.m_current_file_path;
+}
+
+//----------------------------------------------------------
+cmt_string Cmt::configure_current_package ()
+//void Cmt::configure_current_package ()
 {
   /*
@@ -800 +1012 @@
     standard directory tree (i.e. <package>/<version>/cmt or mgr)
   */
+  Use& use = Use::current();
+  if (use.located ())
+    {
+      Me.m_current_style = use.style;
+      build_prefix (Me.m_current_package, Me.m_current_prefix);
+      build_config (Me.m_current_prefix, Me.m_current_config);
+
+      cmt_string req;
+      use.get_full_path (req);
+      switch (use.style)
+        {
+        case cmt_style:
+          req += CmtSystem::file_separator ();
+          req += "cmt";
+          break;
+        case mgr_style:
+          req += CmtSystem::file_separator ();
+          req += "mgr";
+          break;
+        default:
+          break;
+        }
+      req += CmtSystem::file_separator ();
+      req += "requirements";
+      return req;
+    }
 
   cmt_string req = "..";
@@ -813 +1051 @@
   else
     {
-      cmt_string req = "..";
+      req = "..";
+      //      cmt_string req = "..";
       req += CmtSystem::file_separator ();
       req += "mgr";
@@ -827 +1066 @@
           // This package is probably a standalone one
           Me.m_current_style = none_style;
+          req = "requirements";
+          if (!CmtSystem::test_file (req))
+            {
+              req = "";
+            }
         }
     }
@@ -1062 +1306 @@
       // Do NOT (re)set m_current_structuring_style yet
       // (as requirements may NOT exist, so this is not a package)
-      // rather do it in reach_current_package (if/when requirements is read)
+      // rather do it in use_current_package (if/when requirements is read)
       //Me.m_current_structuring_style = without_version_directory;
       build_prefix (Me.m_current_package, Me.m_current_prefix);
       build_config (Me.m_current_prefix, Me.m_current_config);
     }
+
+  return req;
 }
 
@@ -1074 +1320 @@
 {
   cmt_string s;
-  s = CmtSystem::getenv ("CMTSTRUCTURINGSTYLE");
-  if (s == "without_version_directory")
-    {
-      Me.m_current_structuring_style = without_version_directory;
-    }
-  else if (s == "with_version_directory")
-    {
-      Me.m_current_structuring_style = with_version_directory;
-    } 
-
-  CmtSystem::cmt_string_vector flags;
-  Cmt::get_cmt_flags (flags);
-  for (int i = 0; i < flags.size (); i++)
-    {
-      const cmt_string& flag = flags[i];
-      if (flag == "-without_version_directory")
+  if (Me.m_current_structuring_style == default_structuring_style)
+    {
+      s = CmtSystem::getenv ("CMTSTRUCTURINGSTYLE");
+      if (s == "without_version_directory")
         {
           Me.m_current_structuring_style = without_version_directory;
         }
-      else if (flag == "-with_version_directory")
+      else if (s == "with_version_directory")
         {
           Me.m_current_structuring_style = with_version_directory;
-        } 
-    }
-
-  for (int i = 1; i < ap.argc; i++)
-    {
-      const cmt_string& arg = ap.argv[i];
-      if (arg[0] != '-') break;
-      if (arg == "-without_v" ||
-          arg == "-without_ve" ||
-          arg == "-without_ver" ||
-          arg == "-without_vers" ||
-          arg == "-without_versi" ||
-          arg == "-without_versio" ||
-          arg == "-without_version" ||
-          arg == "-without_version_" ||
-          arg == "-without_version_d" ||
-          arg == "-without_version_di" ||
-          arg == "-without_version_dir" ||
-          arg == "-without_version_dire" ||
-          arg == "-without_version_direc" ||
-          arg == "-without_version_direct" ||
-          arg == "-without_version_directo" ||
-          arg == "-without_version_director" ||
-          arg == "-without_version_directory")
-        {
-          Me.m_current_structuring_style = without_version_directory;
-          //      if (!CmtSystem::putenv ("CMTSTRUCTURINGSTYLE", "without_version_directory"))
-          //        CmtMessage::error ("Cannot set `CMTSTRUCTURINGSTYLE' to"
-          //                           " `without_version_directory' in the environment");
-          if (!Cmt::add_cmt_flag ("-without_version_directory"))
-            CmtMessage::error ("Cannot add flag `-without_version_directory'");
-        }
-      else if (arg == "-with_v" ||
-               arg == "-with_ve" ||
-               arg == "-with_ver" ||
-               arg == "-with_vers" ||
-               arg == "-with_versi" ||
-               arg == "-with_versio" ||
-               arg == "-with_version" ||
-               arg == "-with_version_" ||
-               arg == "-with_version_d" ||
-               arg == "-with_version_di" ||
-               arg == "-with_version_dir" ||
-               arg == "-with_version_dire" ||
-               arg == "-with_version_direc" ||
-               arg == "-with_version_direct" ||
-               arg == "-with_version_directo" ||
-               arg == "-with_version_director" ||
-               arg == "-with_version_directory")
-        {
-          Me.m_current_structuring_style = with_version_directory;
-          //      if (!CmtSystem::putenv ("CMTSTRUCTURINGSTYLE", "with_version_directory"))
-          //        CmtMessage::error ("Cannot set `CMTSTRUCTURINGSTYLE' to"
-          //                           " `with_version_directory' in the environment");
-          if (!Cmt::add_cmt_flag ("-with_version_directory"))
-            CmtMessage::error ("Cannot add flag `-with_version_directory'");
+        }
+      
+      CmtSystem::cmt_string_vector flags;
+      Cmt::get_cmt_flags (flags);
+      for (int i = 0; i < flags.size (); i++)
+        {
+          const cmt_string& flag = flags[i];
+          if (flag == "-without_version_directory")
+            {
+              Me.m_current_structuring_style = without_version_directory;
+            }
+          else if (flag == "-with_version_directory")
+            {
+              Me.m_current_structuring_style = with_version_directory;
+            } 
+        }
+    }
+  
+  if (Me.m_current_structuring_style != default_structuring_style)
+    {
+      StrategyDef* def = StrategyMgr::find_strategy ("VersionDirectory");
+      if (def != 0)
+        {
+          def->m_default_value =
+            Me.m_current_structuring_style == with_version_directory;
+          def->m_priority_value =
+            Me.m_current_structuring_style == without_version_directory;
         }
     }
@@ -1171 +1376 @@
 void Cmt::configure_home (Use* use)
 {
-  Me.m_cmt_home = "";
-
-  Symbol* symbol = Symbol::find ("CMTHOME");
-  if (symbol != 0)
-    {
-      Me.m_cmt_home = symbol->build_macro_value ();
-      Symbol::expand (Me.m_cmt_home);
-    }
-  else if (CmtSystem::testenv ("CMTHOME"))
-    {
-      Me.m_cmt_home = CmtSystem::getenv ("CMTHOME");
+  if (Me.m_cmt_home.size () == 0)
+    {
+      // if not passed on the command line
+      if (const Symbol* symbol = Symbol::find ("CMTHOME"))
+        {
+          Me.m_cmt_home = symbol->build_macro_value ();
+          Symbol::expand (Me.m_cmt_home);
+        }
+      else if (CmtSystem::testenv ("CMTHOME"))
+        {
+          Me.m_cmt_home = CmtSystem::getenv ("CMTHOME");
+        }
     }
 
@@ -1195 +1401 @@
 void Cmt::configure_user_context (Use* use)
 {
-  Me.m_cmt_user_context = "";
-
-  Symbol* symbol = Symbol::find ("CMTUSERCONTEXT");
-  if (symbol != 0)
-    {
-      Me.m_cmt_user_context = symbol->build_macro_value ();
-      Symbol::expand (Me.m_cmt_user_context);
-    }
-  else if (CmtSystem::testenv ("CMTUSERCONTEXT"))
-    {
-      Me.m_cmt_user_context = CmtSystem::getenv ("CMTUSERCONTEXT");
+  if (Me.m_cmt_user_context.size () == 0)
+    {
+      // if not passed on the command line
+      if (const Symbol* symbol = Symbol::find ("CMTUSERCONTEXT"))
+        {
+          Me.m_cmt_user_context = symbol->build_macro_value ();
+          Symbol::expand (Me.m_cmt_user_context);
+        }
+      else if (CmtSystem::testenv ("CMTUSERCONTEXT"))
+        {
+          Me.m_cmt_user_context = CmtSystem::getenv ("CMTUSERCONTEXT");
+        }
     }
 
@@ -1272 +1479 @@
 
   Cmt::configure_tags (use);
+
+  cmt_string s, t;
+  if (0 < Me.m_extra_tags.size ())
+    {
+      s = "CMTEXTRATAGS";
+      t = use != 0 ? use->get_package_name () : s;
+    }
+  for (int i = 0; i < Me.m_extra_tags.size (); i++)
+    {
+      Tag* tag = Tag::add (Me.m_extra_tags[i], PriorityUserTag, s, use);
+      tag->mark (t);
+    }
+
+  for (int i = 0; i < Me.m_tags.size (); i++)
+    {
+      const cmt_string& a = Me.m_tags[i];
+      if (i == 0)
+        {
+          Me.m_current_tag = a;
+        }
+//       // Then restore uname if the specified tag is CMTCONFIG
+//       if (a == CmtSystem::get_cmt_config ())
+//      {
+//        Cmt::configure_uname_tag ();
+//      }
+      Tag* tag = Tag::add (a, PriorityArgument, "arguments", 0);
+      tag->mark ("arguments");
+    }
+
+  for (int i = 0; i < Me.m_tags_add.size (); i++)
+    {
+      const cmt_string& a = Me.m_tags_add[i];
+//       // Then restore uname if the specified tag is CMTCONFIG
+//       if (a == CmtSystem::get_cmt_config ())
+//      {
+//        Cmt::configure_uname_tag ();
+//      }
+      Tag* tag = Tag::add (a, PriorityUserTag, "arguments", 0);
+      tag->mark ("arguments");
+    }
 
   /*
@@ -1277 +1524 @@
   */
 
+  /*
   if (CmtSystem::testenv ("CMTEXTRATAGS"))
     {
@@ -1309 +1557 @@
         }
     }
+  */
 }
 
@@ -1319 +1568 @@
 
   log << "current_tag=" << Me.m_current_tag << log_endl;
+
+  cmt_string s = "CMTCONFIG";
 
   Symbol* symbol = Symbol::find ("CMTCONFIG");
@@ -1347 +1598 @@
     {
       config_tag = CmtSystem::getenv ("CMTBIN");
+      s = "CMTBIN";
     }
 
@@ -1352 +1604 @@
     {
       CmtSystem::get_uname (config_tag);
+      s = "uname";
     }
 
   log << "current_tag=" << Me.m_current_tag << log_endl;
 
-  cmt_string s = "CMTCONFIG";
+  //  cmt_string s = "CMTCONFIG";
   cmt_string t = s;
 
@@ -1552 +1805 @@
           if (CmtMessage::level () != Warning)
             CmtMessage::set_level (Warning);
-          //      if (CmtMessage::level () > Warning)
-        }
-    }
-
-  for (int i = 1; i < ap.argc; i++)
-    {
-      const cmt_string& arg = ap.argv[i];
-      if (arg[0] != '-') break;
-      if (arg == "-d" ||
-          arg == "-di" ||
-          arg == "-dis" ||
-          arg == "-disa" ||
-          arg == "-disab" ||
-          arg == "-disabl" ||
-          arg == "-disable" ||
-          arg == "-disable_" ||
-          arg == "-disable_w" ||
-          arg == "-disable_wa" ||
-          arg == "-disable_war" ||
-          arg == "-disable_warn" ||
-          arg == "-disable_warni" ||
-          arg == "-disable_warnin" ||
-          arg == "-disable_warning" ||
-          arg == "-disable_warnings")
-        {
-          Me.m_disable_warnings = true;
-          if (CmtMessage::level () <= Warning)
-            {
-              CmtMessage::set_level (Error);
-              //              if (!CmtSystem::putenv ("CMTERROR", "1"))
-              //                CmtMessage::error ("Cannot set `CMTERROR' in the environment");
-            }
-          if (!Cmt::add_cmt_flag ("-disable_warnings"))
-            CmtMessage::error ("Cannot add flag `-disable_warnings'");
-        }
-      else if (arg == "-q" ||
-               arg == "-qu" ||
-               arg == "-qui" ||
-               arg == "-quie" ||
-               arg == "-quiet")
-        {
-          Me.m_quiet = true;
-          if (CmtMessage::level () <= Error)
-            {
-              CmtMessage::set_level (Fatal);
-              //              if (!CmtSystem::putenv ("CMTFATAL", "1"))
-              //                CmtMessage::error ("Cannot set `CMTFATAL' in the environment");
-            }
-          if (!Cmt::add_cmt_flag ("-quiet"))
-            CmtMessage::error ("Cannot add flag `-quiet'");
-        }
-      else if (arg == "-warn" ||
-               arg == "-warni" ||
-               arg == "-warnin" ||
-               arg == "-warning" ||
-               arg == "-warnings")
-        {
-          Me.m_warnings = true;
-          //      if (CmtMessage::level () > Warning)
-          if (CmtMessage::level () != Warning)
-            {
-              CmtMessage::set_level (Warning);
-              //              if (!CmtSystem::putenv ("CMTWARNING", "1"))
-              //                CmtMessage::error ("Cannot set `CMTWARNING' in the environment");
-            }
-          if (!Cmt::add_cmt_flag ("-warnings"))
-            CmtMessage::error ("Cannot add flag `-warnings'");
         }
     }
@@ -1668 +1854 @@
 
   CmtSystem::cmt_string_vector uses;
+  cmt_vector<int> use_indexes;
   CmtSystem::cmt_string_vector packages;
   CmtSystem::cmt_string_vector versions;
-  CmtSystem::cmt_string_vector path_selections;
+  Project::ConstProjectPtrVector path_selections;
+  //  CmtSystem::cmt_string_vector path_selections;
+  Project::ConstProjectPtrVector path_exclusions;
   CmtSystem::cmt_string_vector selections;
   CmtSystem::cmt_string_vector exclusions;
@@ -1677 +1866 @@
   bool is_cmt = false;
   int first = 0;
-  int i;
   bool ignore_errors = false;
   bool all_packages = false;
-
+  int depth (1);
   bool local = true;
-
-  for (i = 0; i < ap.arguments.size (); i++)
+  bool global (false);
+
+  for (int i = 0; i < ap.arguments.size (); i++)
     {
       const cmt_string& w = ap.arguments[i];
@@ -1699 +1888 @@
             {
               local = false;
+              global = false;
 
               cmt_string depth_str;
-              int depth_value = 0;
+              int depth_value;
                           
               w.substr (7, depth_str);
-              if ((sscanf (depth_str.c_str (), "%d", &depth_value) < 1) ||
-                  (depth_value < 1))
-                {
+              int n = sscanf (depth_str.c_str (), "%d", &depth_value);
+              cmt_string msg;
+              switch (n)
+                {
+                case EOF:
+                  msg = "Cannot read `depth' value `";
+                  msg += depth_str;
+                  msg += cmt_string ("'");
+                  if (errno)
+                    msg += cmt_string (strerror (errno));
+                  CmtError::set (CmtError::system_error, msg);
+                  return;
+                  break;
+                case 0:
+                  msg = "Invalid `depth' value `";
+                  msg += depth_str;
+                  msg += cmt_string ("'");
+                  CmtError::set (CmtError::syntax_error, msg);
+                  return;
+                  break;
+                case 1:
+                  if (depth_value < -1)
+                    {
+                      char num[32]; sprintf (num, "%lu", -depth_value);
+                      msg = "Invalid `depth' value `-";
+                      msg += num;
+                      msg += cmt_string ("'");
+                      CmtError::set (CmtError::syntax_error, msg);
+                      return;
+                    }
+                  depth = depth_value;
+                  //cerr << "depth: " << depth << endl;
+                  break;
+                default:
+                  break;
+                }
+//               if ((sscanf (depth_str.c_str (), "%d", &depth_value) < 1) ||
+//                   (depth_value < 1))
+//                {
                   // Syntax error
                   //  We shall restrict to packages found within 
@@ -1712 +1938 @@
                   //  If CMTPATH is empty, nothing is selected.
                   // depth=1 is equivalent to local
-                }
-
-              Project::fill_selection (depth_value, path_selections);
+//                }
+
+//            Project::fill_selection (depth_value, path_selections);
             }
           else if (w.substr (0, 9) == "-exclude=")
@@ -1738 +1964 @@
           else if (w.substr (0, 7) == "-global")
             {
-              path_selections.clear ();
-
+              //path_selections.clear ();
+              global = true;
               local = false;
             }
@@ -1745 +1971 @@
             {
               local = true;
+              global = false;
             }
           else if (w.substr (0, 8) == "-select=")
@@ -1787 +2014 @@
     }
 
-  if (local)
-    {
-      Project::fill_selection (1, path_selections);
+  const Project* p_cur (Project::get_current ());
+  if (global)
+    {
+      Project::fill_exclusion (path_exclusions);
+    }
+  else if (local)
+    {
+      if (p_cur)
+        Project::fill_selection (1, path_selections);
+      else
+        path_selections.push_back (0); // means that we want Use::current ()
+      //        path_selections.push_back ((Use::current ()).get_realpath ());
+    }
+  else
+    {
+      if (!p_cur
+          && depth != 0
+          && depth != -1)
+        path_selections.push_back (0); // means that we want Use::current ()
+//      path_selections.push_back ((Use::current ()).get_realpath ());
+      Project::fill_selection (depth, path_selections);
+      /*
+      cerr << "depth: " << depth << endl;
+      for (int j = 0; j < path_selections.size (); j++)
+        {
+          const Project* sp = path_selections[j];
+          cerr << "path_selections: " << (sp ? sp->get_cmtpath () : "current use") << endl;
+        }
+      */
     }
 
@@ -1800 +2053 @@
   //if (command.substr (0, 3) == "cmt") is_cmt = true;
 
-  cmt_string curuse = CmtSystem::pwd ();
+  //cmt_string curuse = CmtSystem::pwd ();
   if (all_packages)
     {
@@ -1806 +2059 @@
       PathScanner scanner;
       Project::scan_paths (scanner, selector);
+      return;
     }
   else
     {
-      for (i = Uses.size () - 1; i >= 0; i--)
+      for (int i = Uses.size () - 1; i >= 0; i--)
         {
           Use* use = Uses[i];
@@ -1815 +2069 @@
           if (use->discarded) continue;
           if (use->m_hidden) continue;
-
           if (!use->located ())
             {
-              CmtMessage::warning ("package " + use->get_package_name ()
-                                   + " " + use->version + " " + use->path
-                                   + " not found");
-              /*
-              if (!Me.m_quiet)
-                {
-                  cerr << "#CMT> package " << use->get_package_name () <<
-                    " " << use->version << " " << use->path <<
-                    " not found" <<
-                    endl;
-                }
-              */
+              CmtMessage::warning
+                (CmtError::get_error_name (CmtError::package_not_found)
+                 + ": " + use->get_info ());
+              continue;
             }
-          else
-            {
-              if (use->get_package_name () != "CMT")
-                {
-                  cmt_string& s = uses.add ();
-
-                  use->get_full_path (s);
-
-                  s += CmtSystem::file_separator ();
-                  if (use->style == mgr_style) s += "mgr";
-                  else s += "cmt";
-
-                  cmt_string& v = versions.add ();
-                  v = use->version;
-
-                  cmt_string& p = packages.add ();
-                  p = use->get_package_name ();
-                }
-            }
-        }
+          if (use->get_package_name () == "CMT") continue;
+
+          cmt_string& s = uses.add ();
+          use->get_full_path (s);
+          switch (use->style)
+            {
+            case cmt_style:
+              s += CmtSystem::file_separator ();
+              s += "cmt";
+              break;
+            case mgr_style:
+              s += CmtSystem::file_separator ();
+              s += "mgr";
+              break;
+            default:
+              break;
+            }
+//                   if (use->style == mgr_style) s += "mgr";
+//                   else s += "cmt";
+
+          cmt_string& v = versions.add ();
+          v = use->version;
+          
+          cmt_string& p = packages.add ();
+          p = use->get_package_name ();
+          
+          int& use_index = use_indexes.add ();
+          use_index = i;
+        }
           
       {
+        Use* use = &(Use::current ());
+        
         cmt_string& s = uses.add ();
+        use->get_full_path (s);
+        switch (use->style)
+          {
+          case cmt_style:
+            s += CmtSystem::file_separator ();
+            s += "cmt";
+            break;
+          case mgr_style:
+            s += CmtSystem::file_separator ();
+            s += "mgr";
+            break;
+          default:
+            break;
+          }
+//         if (use->get_package_name ().find ("cmt_standalone") != cmt_string::npos)
+//           {
+//             s = CmtSystem::pwd ();
+//           }
+//         else
+//           {
+//             use->get_full_path (s);
+
+//             s += CmtSystem::file_separator ();
                   
-        Use* use = &(Use::current ());
-
-        if (use->get_package_name ().find ("cmt_standalone") != cmt_string::npos)
-          {
-            s = CmtSystem::pwd ();
-          }
-        else
-          {
-            use->get_full_path (s);
-
-            s += CmtSystem::file_separator ();
-                  
-            if (use->style == mgr_style) s += "mgr";
-            else s += "cmt";
-          }
-
-        curuse = s;
+//             if (use->style == mgr_style) s += "mgr";
+//             else s += "cmt";
+//           }
+        //curuse = s;
 
         cmt_string& v = versions.add ();
@@ -1878 +2144 @@
         cmt_string& p = packages.add ();
         p = use->get_package_name ();
+          
+        int& use_index = use_indexes.add ();
+        use_index = -1;
       }
     }
@@ -1891 +2160 @@
     CmtSystem::putenv ("CMTBCAST", "");
 
-  for (i = 0; i < uses.size (); i++)
+  for (int i = 0; i < uses.size (); i++)
     {
       const cmt_string& s = uses[i];
       const cmt_string& v = versions[i];
       const cmt_string& p = packages[i];
+      const int use_index = use_indexes[i];
+
+      const Use* use = use_index >= 0 ? Uses[use_index] : &(Use::current ());
+      const Project* up = use->get_project ();
+
       cmt_string cmtpath;
 
       bool ok = true;
-      bool selected = true;
+      bool selected = global ? true : false;
       bool excluded = false;
 
-      /**
-         Ensure that the current package is not skipped
-         due to symlinks in the paths
-       */
-      //      if (path_selections.size () > 0)
-      if (path_selections.size () > 0 && s != curuse)
+      ok = selected;
+      if (path_selections.size () > 0)
         {
           selected = false;
-
           for (int j = 0; j < path_selections.size (); j++)
             {
-              const cmt_string& sel = path_selections[j];
-              
-              if (s.find (sel) != cmt_string::npos) 
-                {
-                  cmtpath = sel;
-                  selected = true;
-                  break;
-                }
-            }
-
+              const Project* sp = path_selections[j];
+              if (sp)
+                {
+                  if (up)
+                    {
+                      if (up == sp)
+                        {
+                          cmtpath = sp->get_cmtpath ();
+                          selected = true;
+                          break;
+                        }
+                    }
+                  else
+                    {
+                      if (use->get_realpath ().find (sp->get_cmtpath_real ()) == 0)
+                        {
+                          cmtpath = sp->get_cmtpath ();
+                          selected = true;
+                          break;
+                        }
+                    }
+                }
+              else if (use == &(Use::current ()))
+                {
+                  // means that we want Use::current ()
+                  // cmtpath = sp->get_cmtpath ();
+                  if (up)
+                    cmtpath = up->get_cmtpath ();
+                  else
+                    cmtpath = "";
+                  selected = true;
+                  break;
+                }
+              // const cmt_string& sel = path_selections[j];
+              // if (s.find (sel) != cmt_string::npos) 
+//                 {
+//                cmtpath = sel;
+//                   selected = true;
+//                   break;
+//                 }
+            }
           ok = selected;
         }
+      else if (up)
+        cmtpath = up->get_cmtpath ();
 
       if (ok)
@@ -1960 +2262 @@
         }
 
-
       if (ok)
         {
@@ -1974 +2275 @@
                   break;
                 }
+            }
+
+          if (excluded) ok = false;
+        }
+
+      if (ok)
+        {
+          excluded = false;
+          for (int j = 0; j < path_exclusions.size (); j++)
+            {
+              const Project* sp = path_exclusions[j];
+              if (up)
+                {
+                  if (up == sp)
+                    {
+                      excluded = true;
+                      break;
+                    }
+                }
+              else
+                {
+                  if (use->get_realpath ().find (sp->get_cmtpath_real ()) == 0)
+                    {
+                      excluded = true;
+                      break;
+                    }
+                }
             }
 
@@ -2021 +2349 @@
         }
 
+      /*
       if (cmtpath == "")
         {
@@ -2026 +2355 @@
           cmtpath = Project::find_in_cmt_paths (sel);
         }
+      */
 
       cmt_string cmd = command;
@@ -2041 +2371 @@
       static const cmt_string empty_string;
       static const cmt_string fs = CmtSystem::file_separator ();
-      cmt_string offset = s;
-      offset.replace (cmtpath, empty_string);
-      if (offset[0] == CmtSystem::file_separator ())
-        {
-          offset.replace (fs, empty_string);
-        }
-      CmtSystem::dirname (offset, offset);
-
-      cmt_string n;
-      CmtSystem::basename (offset, n);
-      if (n == p)
-        {
+      cmt_string offset;
+      if (cmtpath.size ())
+        {
+          offset = s;
+          offset.replace (cmtpath, empty_string);
+          if (offset[0] == CmtSystem::file_separator ())
+            {
+              offset.replace (fs, empty_string);
+            }
           CmtSystem::dirname (offset, offset);
+          
+          cmt_string n;
+          CmtSystem::basename (offset, n);
+          if (n == p)
+            {
+              CmtSystem::dirname (offset, offset);
+            }
+          else
+            {
+              CmtSystem::dirname (offset, offset);
+              CmtSystem::dirname (offset, offset);
+            }
         }
       else
         {
-          CmtSystem::dirname (offset, offset);
-          CmtSystem::dirname (offset, offset);
-        }
-
+          offset = use->real_path;
+        }
       cmd.replace_all (offset_template, offset);
 
@@ -2067 +2404 @@
     {
       cout << "#--------------------------------------------------------------" << endl;
-      cout << "# Now trying [" << cmd << "] in " << s << " (" << i+1 << "/" << uses.size () 
+      cout << "# " << p << " " << v << " " << offset << ": Now trying [" << cmd << "] in " << s << " (" << i+1 << "/" << uses.size () 
            << ")" << endl;
       cout << "#--------------------------------------------------------------" << endl;
@@ -2904 +3241 @@
     }
 
-  static CmtSystem::cmt_string_vector tags;
+  //  static CmtSystem::cmt_string_vector tags;
 
   if (action_build_constituents_config != get_action ())
-    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)) 
-        {
-          CmtMessage::warning ("The tag " + t + " is not used in any tag expression. Please check spelling");
-          //      cerr << "#CMT> The tag " << t << " is not used in any tag expression. Please check spelling" << endl;
-        }
-    }
-
-  Symbol::check_all_paths ();
+    {
+    //    CmtSystem::split (Me.m_extra_tags, " \t,", tags);
+
+    //  for (int i = 0; i < tags.size (); i++)
+      //    {
+      //      const cmt_string& t = tags[i];
+      for (int i = 0; i < Me.m_extra_tags.size (); i++)
+        {
+          const cmt_string& t = Me.m_extra_tags[i];
+          tag = Tag::find (t);
+          if (tag == 0) continue;
+          if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+            {
+              CmtMessage::warning ("The tag " + t + " is not used in any tag expression. Please check spelling");
+            }
+        }
+      for (int i = 0; i < Me.m_tags.size (); i++)
+        {
+          const cmt_string& t = Me.m_tags[i];
+          tag = Tag::find (t);
+          if (tag == 0) continue;
+          if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+            {
+              CmtMessage::warning ("The tag " + t + " is not used in any tag expression. Please check spelling");
+            }
+        }
+      for (int i = 0; i < Me.m_tags_add.size (); i++)
+        {
+          const cmt_string& t = Me.m_tags_add[i];
+          tag = Tag::find (t);
+          if (tag == 0) continue;
+          if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
+            {
+              CmtMessage::warning ("The tag " + t + " is not used in any tag expression. Please check spelling");
+            }
+        }
+    }
+
+  if (action_setup != get_action () ||
+      Requirements == ap.mode)
+    // PathBuilder::filter_path_value is called
+    // for each path in Symbol::print
+    Symbol::check_all_paths ();
 
   env = CmtSystem::getenv ("CMTSITE");
@@ -2940 +3303 @@
     {
       CmtMessage::warning ("The CMTSITE value " + env + " is not used in any tag expression. Please check spelling");
-      //      cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl;
     }
 
@@ -4323 +4685 @@
       break;
     case Requirements :
+      /*
       CmtSystem::cmt_string_vector flags;
       get_cmt_flags (flags);
       cout << "\n# CMTFLAGS: -without_cmt";
+      cout << " -without_projects" ;
       for (int i = 0; i < flags.size (); i++)
         {
@@ -4332 +4696 @@
           else if (flags[i] == "-with_cmt")
             cout << " -without_cmt";
+          else if (flags[i] == "-without_projects")
+            cout << " -with_projects";
+          else if (flags[i] == "-with_projects")
+            cout << " -without_projects";
           else
             cout << " " << flags[i]; 
         }
       cout << endl;
+      */
       break;
-    }
-  print (ap.mode);
+    default:
+      break;
+    }
+
+  ostringstream os;
+  ostringstream oh;
+  bool reset (false);
+  CmtSystem::cmt_string_vector flags;
+  cmt_string strip_path_flag;
+  bool strip_path (false);
+
+  bool strip_saved (get_strip_path ());
+  bool access_saved (Cmt::get_env_access ());
+
+  switch (ap.mode)
+    {
+    case Requirements :
+
+      get_cmt_flags (flags);
+      for (int i = 0; i < flags.size (); i++)
+        {
+          if (flags[i] == "-no_strip_path")
+            strip_path_flag = "-no_strip_path";
+          else if (flags[i] == "-strip_path")
+            strip_path_flag = "-strip_path";
+        }
+      if (strip_path_flag != "-no_strip_path" &&
+          !get_strip_path ())
+        reset = Symbol::set_strip_path (true);
+
+      if (get_strip_path () || reset)
+        strip_path = true;
+      else
+        strip_path = false;
+
+      Cmt::set_env_access (false);
+
+      print (ap.mode, os);
+
+      if (CmtError::get_last_error_code () == CmtError::warning &&
+          (get_strip_path () || reset))
+        {
+          reset = Symbol::set_strip_path (false);
+          if (reset)
+            {
+              strip_path = false;
+
+              CmtError::print ();
+              CmtError::clear ();
+
+              if (Cmt::get_debug ())
+                {
+                  cerr << "|Cmt::do_setup> Failure with:\n" << os.str ()
+                       << "|Cmt::do_setup> Trying again." << endl;
+                }
+
+              // Try again
+              os.str ("");
+              print (ap.mode, os);
+            }
+        }
+
+      if (reset) Symbol::set_strip_path (strip_saved);
+      Cmt::set_env_access (access_saved);
+
+      //get_cmt_flags (flags);
+      oh << "\n# CMTFLAGS:"
+        " -without_cmt"
+        " -without_projects"
+        //" -strip_path"
+        ;
+      for (int i = 0; i < flags.size (); i++)
+        {
+          if (flags[i] == "-without_cmt")
+            oh << " -with_cmt";
+          else if (flags[i] == "-with_cmt")
+            oh << " -without_cmt";
+          else if (flags[i] == "-without_projects")
+            oh << " -with_projects";
+          else if (flags[i] == "-with_projects")
+            oh << " -without_projects";
+          /*
+          else if (flags[i] == "-no_strip_path")
+            oh << " -strip_path";
+          else if (flags[i] == "-strip_path")
+            oh << " -no_strip_path";
+          */
+          else if (flags[i] == "-no_strip_path" ||
+                   flags[i] == "-strip_path")
+            continue;
+          else
+            oh << " " << flags[i]; 
+        }
+      //if (reset) oh << " -strip_path";
+      if (strip_path)
+        oh << " -no_strip_path";
+      else
+        oh << " -strip_path";
+      oh << endl;
+
+      cout << oh.str ();
+      cout << os.str ();
+
+      break;
+
+    default:
+
+      print (ap.mode);
+
+      break;
+    }
+
   switch (ap.mode)
     {
@@ -4476 +4955 @@
 
   Use& use = Use::current();    
+  /*
   use.get_cmtpath_and_offset (cmtpath, offset);
 
   Project* p = Project::find_by_cmtpath (cmtpath);
-
-  cout << p->get_author () << endl;
+  */
+  if (const Project* p = use.get_project ())
+    cout << p->get_author () << endl;
 }
 
@@ -4503 +4984 @@
   ClientCollector collector (package, version);
 
+  /*
   clear     ();
   //  configure ();
   configure (ap);
+  */
 
   cout << "# ----------- Clients of " << package
@@ -5164 +5647 @@
 
 //----------------------------------------------------------
+/*
 ActionType Cmt::get_action ()
 {
   return (Me.m_action);
 }
-
+*/
 /*
   const CmtSystem::cmt_string_vector& Cmt::get_cmt_path ()
@@ -5185 +5669 @@
   }
 */
-
+ /*
 const cmt_string& Cmt::get_cmt_home ()
 {
@@ -5205 +5689 @@
   return (Me.m_current_dir);
 }
-
+*/
 const cmt_string Cmt::get_current_dir_real ()
 {
@@ -5213 +5697 @@
   return (Me.m_current_dir);
 }
-
+/*
 const cmt_string& Cmt::get_current_package ()
 {
   return (Me.m_current_package);
 }
-
+*/
 const cmt_string& Cmt::get_current_path ()
 {
@@ -5233 +5717 @@
   return (Me.m_current_offset);
 }
-
+/*
 AccessMode Cmt::get_current_access ()
 {
@@ -5248 +5732 @@
   return (Me.m_current_style);
 }
-
+*/
 const cmt_string& Cmt::get_current_version ()
 {
   return (Me.m_current_version);
 }
-
+/*
 const cmt_string& Cmt::get_current_target ()
 {
   return (Me.m_current_target);
 }
-
+*/
+/*
+const CmtSystem::cmt_string_vector& Cmt::get_tags_remove ()
+{
+  return (Me.m_tags_remove);
+}
+*/
+ /*
 bool Cmt::get_debug ()
 {
@@ -5283 +5774 @@
   return (Me.m_recursive);
 }
-
+ */
 CmtScopeFilteringMode Cmt::get_scope_filtering_mode ()
 {
@@ -5297 +5788 @@
 
 //----------------------------------------------------------
+/*
 bool Cmt::get_all_sets_done ()
 {
   return (Me.m_all_sets_done);
 }
-
+*/
 //----------------------------------------------------------
 void Cmt::get_cmt_flags (CmtSystem::cmt_string_vector& flags)
@@ -5421 +5913 @@
 void Cmt::guess_current_project ()
 {
+  if (!m_cmt_context.m_use_projects) return;
+
   Log;
 
   log << "guess_current_project" << log_endl;
 
-  cmt_string here = CmtSystem::pwd ();
+  //  cmt_string here = CmtSystem::pwd ();
 
   Use& use = Use::current();
@@ -5438 +5932 @@
     //  if (Project::find_in_cmt_paths (Me.m_current_dir) == "")
     {
+      /*
       if (!CmtSystem::cd (current_path))
         {
@@ -5444 +5939 @@
           return;
         }
+      */
       cmt_string project_file = "cmt";
       project_file += CmtSystem::file_separator ();
       project_file += Project::get_project_file_name ();
 
-      cmt_string pwd;
+      /*
+      cmt_string pwd (CmtSystem::pwd ());
+      cmt_string pwd_prev;
+      */
+      cmt_string dir_cur (current_path);
+      cmt_string dir_par;
+
+      cmt_string proj_file_cur;
 
       for (;;)
         {
-          pwd = CmtSystem::pwd ();
+          /*
+          //      pwd = CmtSystem::pwd ();
           if (CmtSystem::test_file (project_file))
             {
@@ -5462 +5966 @@
               break;
             }
-
-          log << "pwd=" << CmtSystem::pwd () << log_endl;
+          */
+          proj_file_cur = dir_cur;
+          proj_file_cur += CmtSystem::file_separator ();
+          proj_file_cur += project_file;
+          if (CmtSystem::test_file (proj_file_cur))
+            {
+              //this directory should become the first entry of the CMTPATH
+
+              IProjectFactory& factory = ProjectFactory::instance ();
+              factory.create_project ("", dir_cur, "CurrentProject", 0);
+
+              break;
+            }
+
+          /*
+          log << "pwd=" << pwd << log_endl;
           
           if (!CmtSystem::cd (".."))
@@ -5471 +5989 @@
             }
 
-          if (CmtSystem::pwd () == pwd)
+          pwd_prev = pwd;
+          pwd = CmtSystem::pwd ();
+          if (pwd == pwd_prev)
+            //    if (CmtSystem::pwd () == pwd)
             {
               log << "Looks the same pwd..." << log_endl;
               break;
             }
-        }
-
-      CmtSystem::cd (Me.m_current_dir);
-    }
+          */
+          log << "dir_cur=`" << dir_cur << "'" << log_endl;
+          CmtSystem::dirname (dir_cur, dir_par);
+          if (dir_par == dir_cur)
+            {
+              log << "Looks the same dir_cur..." << log_endl;
+              break;
+            }
+          dir_cur = dir_par;
+        }
+
+      //      CmtSystem::cd (Me.m_current_dir);
+    } // if (Project::find_in_cmt_paths (current_path) == "")
 
   //cmt_string buffer = "path CMTPATH \n";
@@ -5487 +6017 @@
   //  Use& use = Use::current();
 
+  bool autoconfigure_cmtpath_saved (Me.m_autoconfigure_cmtpath);
+  Me.m_autoconfigure_cmtpath = false;
   bool save_quiet = Me.m_quiet;
   Me.m_quiet = true;
@@ -5493 +6025 @@
 
   Me.m_quiet = save_quiet;
-
-  Me.m_autoconfigure_cmtpath = true;
-
-  CmtSystem::cd (here);
+  Me.m_autoconfigure_cmtpath = autoconfigure_cmtpath_saved;
+  //  Me.m_autoconfigure_cmtpath = true;
+
+  //  CmtSystem::cd (Me.m_current_dir);
+  //CmtSystem::cd (here);
 }
 
@@ -5966 +6499 @@
               fprintf (f, "endif\n");
               fprintf (f, "source ${CMTROOT}/mgr/setup.csh\n");
-              fprintf (f, "set cmt%stempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n", mangled_package.c_str ());
+              fprintf (f, "set cmt%stempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`\n", mangled_package.c_str ());
               fprintf (f, "if $status != 0 then\n  set cmt%stempfile=/tmp/cmt.$$\nendif\n", mangled_package.c_str ());
-              //fprintf (f, "${CMTROOT}/mgr/cmt setup -%s "
-              fprintf (f, "${CMTROOT}/mgr/cmt %s -%s "
+              fprintf (f, "${CMTROOT}/${CMTBIN}/cmt.exe %s -%s "
                        "-pack=%s -version=%s -path=%s %s $* >${cmt%stempfile}\n",
                        action.c_str (),
@@ -5980 +6512 @@
               fprintf (f,
                        "if ( $status != 0 ) then\n"
-                       "  echo \"${CMTROOT}/mgr/cmt %s -%s "
+                       "  echo \"${CMTROOT}/${CMTBIN}/cmt.exe %s -%s "
                        "-pack=%s -version=%s -path=%s %s $* >${cmt%stempfile}\"\n"
                        "  set cmt%sstatus=2\n"
@@ -6026 +6558 @@
               fprintf (f, "fi\n");
               fprintf (f, ". ${CMTROOT}/mgr/setup.sh\n");
-              fprintf (f, "cmt%stempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n", mangled_package.c_str ());
+              fprintf (f, "cmt%stempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`\n", mangled_package.c_str ());
               fprintf (f, "if test ! $? = 0 ; then cmt%stempfile=/tmp/cmt.$$; fi\n", mangled_package.c_str ());
-              //fprintf (f, "${CMTROOT}/mgr/cmt setup -%s "
-              fprintf (f, "${CMTROOT}/mgr/cmt %s -%s "
+              fprintf (f, "${CMTROOT}/${CMTBIN}/cmt.exe %s -%s "
                        "-pack=%s -version=%s -path=%s %s $* >${cmt%stempfile}\n",
                        action.c_str (),
@@ -6040 +6571 @@
               fprintf (f,
                        "if test $? != 0 ; then\n"
-                       "  echo >&2 \"${CMTROOT}/mgr/cmt %s -%s "
+                       "  echo >&2 \"${CMTROOT}/${CMTBIN}/cmt.exe %s -%s "
                        "-pack=%s -version=%s -path=%s %s $* >${cmt%stempfile}\"\n"
                        "  cmt%sstatus=2\n"
@@ -6074 +6605 @@
           else if (mode[i] == Bat)
             {
-              //fprintf (f, "rem Setting %s %s in %%~d0%%~p0\n",
               fprintf (f, "rem %s %s %s in %%~d0%%~p0\n",
                        action.c_str (),
@@ -6409 +6939 @@
 
   /**
-   * See reach_current_package for an explanation of this call
+   * See apply_globals for an explanation of this call
    */
   Pattern::apply_all_globals ();
@@ -6444 +6974 @@
   Me.m_action = action_none;
 
-  restore_all_tags (0);
+  //  restore_all_tags (0);
 
 #ifdef WIN32
@@ -6481 +7011 @@
 int Cmt::parser (int argc, char* argv[])
 {
+  // save CMTFLAGS
+  cmt_string cmtflags (get_cmt_flags ());
+
+  clear ();
+  Me.initialize ();
+
   ArgParser ap (Me);
   
@@ -6493 +7029 @@
     }
 
-  // save CMTFLAGS
-  cmt_string cmtflags (get_cmt_flags ());
-
-  clear ();
+  //  clear ();
+
+  //  Me.clear ();
+
+  parse_arguments (ap);
+  // Copy ap.mode into cmt_context member/instance
+  set_print_mode (ap.mode);
 
   //  configure ();
-  configure (ap);
-
-  CmtError::clear ();
+  switch (Me.m_action)
+    {
+    case action_none :
+    case action_build_temporary_name :
+    case action_help :
+      break;
+    default:
+      configure (ap);
+      break;
+    }
+  
+  //  CmtError::clear ();
 
   /*
-    Set private if positioned inside the package
+    Set DeveloperMode if positioned inside the package
     (which is detected since we were able to retreive the
     Version, Package and Path)
   */
 
+  if (!Use::current().located ())
+  /*
   if ((Me.m_current_path.size () == 0) ||
       (Me.m_current_package.size () == 0) ||
       (Me.m_current_version.size () == 0))
+  */
     {
       Me.m_current_access = UserMode;
@@ -6520 +7071 @@
     }
   
-  parse_arguments (ap);
+  //  parse_arguments (ap);
   
   if (ap.help_action == action_help)
@@ -6826 +7377 @@
   switch (Me.m_action)
     {
-    case action_none :
+      //case action_none :
     case action_awk :
     case action_broadcast :
@@ -6929 +7480 @@
         Me.m_warnings = false;
         if (strlen (ap.extra_file.c_str ()) == 0)
-          reach_current_package ();
+          use_current_package ();
+        //        reach_current_package ();
         else
           use_extra_file (ap.extra_file);
@@ -6935 +7487 @@
         if (strlen (ap.extra_line.c_str ()) > 0)
           SyntaxParser::parse_requirements_text (ap.extra_line, "extra statement(s)", (Use*) 0);
+        apply_globals ();
         Me.m_warnings = w;
-        //if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, &(Use::current ()));
       }
       break;
@@ -6952 +7504 @@
   if (use != 0 && !use->discarded && !use->m_hidden && use->located ())
     uses.push_back (use);
-  uses.push_back (&(Use::current()));
+  use = &(Use::current());
+  if (use != 0 && !use->discarded && !use->m_hidden && use->located ())
+    uses.push_back (use);
+  //  uses.push_back (&(Use::current()));
   use = Use::find (CmtSystem::get_user_context_package ());
   if (use != 0 && !use->discarded && !use->m_hidden && use->located ())
@@ -7424 +7979 @@
  * joined with semi-colons to form one shell command.
  */
-void Cmt::print (PrintMode mode)
+void Cmt::print (PrintMode mode, ostream& out)
 {
   Use::UsePtrVector& Uses = Use::get_ordered_uses ();
@@ -7452 +8007 @@
   //
 
+  /*
   {
     CmtSystem::cmt_string_vector words;
@@ -7477 +8033 @@
       }
   }
-
+  */
   if (mode == Requirements)
     {
@@ -7487 +8043 @@
           if (tag != 0)
             {
-              tag->show (true, cout, "apply_tag ");
+              tag->show (true, out, "apply_tag ");
             }
         }
@@ -7508 +8064 @@
           if (use.m_hidden) continue;
           
-          print_context (use, mode, tag);
-        }
-    }
-
-  print_context (Use::current (), mode, tag);
+          print_context (use, mode, tag, out);
+        }
+    }
+
+  print_context (Use::current (), mode, tag, out);
 
   if (Me.m_debug)
@@ -7519 +8075 @@
     }
 
-  Symbol::all_print (mode);
+  Symbol::all_print (mode, out);
   // Script::all_print (mode);
 
@@ -7532 +8088 @@
       break;
     default :
-  cout << endl;
+      out << endl;
       break;
     }
@@ -7638 +8194 @@
 
 //----------------------------------------------------------
-void Cmt::print_context (Use& use, PrintMode mode, const cmt_string& tag)
+void Cmt::print_context (Use& use, PrintMode mode, const cmt_string& tag, ostream& out)
 {
   if (use.get_package_name () == "cmt_standalone") return;
@@ -7654 +8210 @@
   switch (mode)
     {
+    case Xml :
     case Requirements :
       break;
@@ -7670 +8227 @@
       if (do_root)
         {
-          cout << "setenv " << prefix << "ROOT \"" <<
+          out << "setenv " << prefix << "ROOT \"" <<
             use.get_full_path () << "\"" << endl;
         }
@@ -7676 +8233 @@
       if (use.get_package_name () == "CMT")
         {
-          cout << "setenv CMTCONFIG " << system << endl;
+          out << "setenv CMTCONFIG " << system << endl;
         }
       else
@@ -7682 +8239 @@
           if (do_config)
             {
-              cout << "setenv " << prefix << "CONFIG \"" << tag << "\"" << endl;
+              out << "setenv " << prefix << "CONFIG \"" << tag << "\"" << endl;
             }
         }
@@ -7690 +8247 @@
       if (do_root)
         {
-          cout << prefix << "ROOT=\"" <<
+          out << prefix << "ROOT=\"" <<
             use.get_full_path () << "\"; export " <<
             prefix << "ROOT" << endl;
@@ -7697 +8254 @@
       if (use.get_package_name () == "CMT")
         {
-          cout << "CMTCONFIG=" << system << "; export CMTCONFIG" << endl;
+          out << "CMTCONFIG=" << system << "; export CMTCONFIG" << endl;
         }
       else
@@ -7703 +8260 @@
           if (do_config)
             {
-              cout << prefix << "CONFIG=\"" <<
+              out << prefix << "CONFIG=\"" <<
                 tag << "\"; export " <<
                 prefix << "CONFIG" << endl;
@@ -7713 +8270 @@
       if (do_root)
         {
-          cout << "set " << prefix << "ROOT=" <<
+          out << "set " << prefix << "ROOT=" <<
             CmtSystem::quote (use.get_full_path (), " \t") << endl;
         }
@@ -7719 +8276 @@
       if (use.get_package_name () == "CMT")
         {
-          cout << "set CMTCONFIG=" << system << endl;
+          out << "set CMTCONFIG=" << system << endl;
         }
       else
@@ -7725 +8282 @@
           if (do_config)
             {
-              cout << "set " << prefix << "CONFIG=" << CmtSystem::quote (tag, " \t") << endl;
+              out << "set " << prefix << "CONFIG=" << CmtSystem::quote (tag, " \t") << endl;
             }
         }
@@ -7733 +8290 @@
       if (do_root)
         {
-          cout << "<variable><name>" << prefix << "ROOT</name>"
-               << "<value>" << use.get_full_path () << "</value></variable>";
+          out << "<variable><name>" << prefix << "ROOT</name>"
+              << "<value>" << use.get_full_path () << "</value></variable>";
         }
 
       if (use.get_package_name () == "CMT")
         {
-          cout << "<variable><name>CMTCONFIG</name>"
-               << "<value>" << system << "</value></variable>";
+          out << "<variable><name>CMTCONFIG</name>"
+              << "<value>" << system << "</value></variable>";
         }
       else
@@ -7746 +8303 @@
           if (do_config)
             {
-              cout << "<variable><name>" << prefix << "CONFIG</name>"
-                   << "<value>" << tag << "</value></variable>";
+              out << "<variable><name>" << prefix << "CONFIG</name>"
+                  << "<value>" << tag << "</value></variable>";
             }
         }
@@ -7756 +8313 @@
           use.get_package_name () != "CMT")
         {
-          cout << "set " << use.prefix << "ROOT " <<
+          out << "set " << use.prefix << "ROOT " <<
             CmtSystem::quote (use.get_full_path (), " \t") << endl;
 
@@ -7775 +8332 @@
       if (use.get_package_name () == "CMT")
         {
-          cout << "set CMTCONFIG " << system << endl;
+          out << "set CMTCONFIG " << system << endl;
         }
       else
@@ -7781 +8338 @@
           if (do_config)
             {
-              cout << "set " << use.prefix << "CONFIG " << CmtSystem::quote (tag, " \t") << endl;
+              out << "set " << use.prefix << "CONFIG " << CmtSystem::quote (tag, " \t") << endl;
+              
+              cmt_string name (use.prefix + "CONFIG");
+              Symbol* symbol = Symbol::find (name);
+              if (symbol != 0) 
+                {
+                  symbol->printed = true;
+                }
+              if (symbol == 0 || symbol->type != Symbol::SymbolMacro)
+                {
+                  CmtMessage::warning
+                    (CmtError::get_error_name (CmtError::symbol_not_found)
+                     + ": macro " + name);
+                }
             }
         }
@@ -7939 +8509 @@
 
 //----------------------------------------------------------
-int Cmt::reach_current_package ()
+int Cmt::use_current_package ()
 {
   Use& use = Use::current ();
@@ -7946 +8516 @@
   if (Me.m_debug)
     {
-      cout << "Cmt::reach_current_package> pwd = " 
+      cout << "Cmt::use_current_package> pwd = " 
            << CmtSystem::pwd () 
            << " path=" << Me.m_current_path
@@ -7959 +8529 @@
   if (Me.m_current_package == "cmt_standalone")
     {
-      if ((Me.m_current_path != "") && (Me.m_current_path != CmtSystem::pwd ()))
+      if ((Me.m_current_path != "") && (Me.m_current_path != Me.m_current_dir))
+//      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");
+                             "Cannot reach the path directory: "
+                             + Me.m_current_path);
               return (0);
             }
@@ -7975 +8547 @@
 
       Me.m_current_structuring_style = without_version_directory;
+      use.structuring_style = Me.m_current_structuring_style;
+      use.change_path (Me.m_current_path, Project::get_current ());
+      Me.m_current_access = DeveloperMode;
     }
   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 (0);
-        }
-
-      Me.m_current_path = use.real_path;
+      if (!use.located ())
+        {
+          //      if (!use.move_to () && !use.move_to ("", true))
+            //      if (!use.move_to ())
+          if (!use.move_to ())
+            {
+              if (!CmtSystem::cd (Cmt::get_current_dir ()))
+                {
+                  CmtError::set (CmtError::file_access_error,
+                                 Cmt::get_current_dir ()
+                                 + " (use_current_package)");
+                  return 0;
+                }
+              if (!use.move_to ("", true))
+                {
+                  CmtError::set (CmtError::package_not_found, use.get_info ());
+                  return 0;
+                }
+            }
+          
+          Me.m_current_path = use.real_path;
+          Me.m_current_access = DeveloperMode;
+        }
     }
   else
@@ -8024 +8613 @@
               
               CmtError::set (CmtError::package_not_found,
-                             "ReachCurrentPackage> Cannot reach the mgr/cmt directory");
+                             "Cannot reach the mgr/cmt directory: "
+                             + use.get_info ());
               return (0);
             }
@@ -8030 +8620 @@
       else
         Me.m_current_style = none_style;
+
+      Me.m_current_access = DeveloperMode;
 
       dir = CmtSystem::pwd ();
@@ -8057 +8649 @@
       use.style   = Me.m_current_style;
       use.structuring_style = Me.m_current_structuring_style;
-    }
-
+
+      configure_current_dir ();
+      build_prefix (Me.m_current_package, Me.m_current_prefix);
+      build_config (Me.m_current_prefix, Me.m_current_config);
+    }
+
+  /*
   configure_current_dir ();
   build_prefix (Me.m_current_package, Me.m_current_prefix);
   build_config (Me.m_current_prefix, Me.m_current_config);
+  */
 
   /*
@@ -8067 +8665 @@
   */
 
-  if (Me.m_debug) cout << "reach_current_package0> current_tag=" << Me.m_current_tag << endl;
+  if (Me.m_debug) cout << "use_current_package0> current_tag=" << Me.m_current_tag << endl;
 
   if (Me.m_current_tag == "")
@@ -8078 +8676 @@
           Tag* tag;
 
-          tag = Tag::add (env, PriorityConfig, "reach current package", 0);
+          tag = Tag::add (env, PriorityConfig, "current package", 0);
           tag->mark (use.get_package_name ());
           //Me.m_current_tag = env;
 
-          //if (!Me.m_quiet) cerr << "reach_current_package1> current_tag=" << Me.m_current_tag << endl;
+          //if (!Me.m_quiet) cerr << "use_current_package1> current_tag=" << Me.m_current_tag << endl;
 
         }
@@ -8100 +8698 @@
   SyntaxParser::parse_requirements (dir, &use);
 
-  if (Me.m_debug) cout << "reach_current_package2> current_tag=" << Me.m_current_tag << endl;
+  if (CmtError::has_pending_error ()) return 0;
+
+  if (Me.m_debug) cout << "use_current_package2> current_tag=" << Me.m_current_tag << endl;
+
+  return 1;
+}
+
+//----------------------------------------------------------
+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::use_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 != Me.m_current_dir))
+//      if ((Me.m_current_path != "") && (Me.m_current_path != CmtSystem::pwd ()))
+        {
+          if (!CmtSystem::cd (Me.m_current_path))
+            {
+              CmtError::set (CmtError::package_not_found,
+                             "Cannot reach the path directory: "
+                             + Me.m_current_path);
+              return (0);
+            }
+        }
+      /*
+      if (!CmtSystem::test_file ("requirements"))
+        {
+          return (0);
+        }
+      */
+      Me.m_current_structuring_style = without_version_directory;
+      use.structuring_style = Me.m_current_structuring_style;
+      use.change_path (Me.m_current_path, Project::get_current ());
+      Me.m_current_access = DeveloperMode;
+    }
+  else if (Me.m_current_package != "")
+    {
+      if (!use.located ())
+        {
+          //      if (!use.move_to () && !use.move_to ("", true))
+            //      if (!use.move_to ())
+          if (!use.move_to ())
+            {
+              if (!CmtSystem::cd (Cmt::get_current_dir ()))
+                {
+                  CmtError::set (CmtError::file_access_error,
+                                 Cmt::get_current_dir ()
+                                 + " (use_extra_file)");
+                  return 0;
+                }
+              if (!use.move_to ("", true))
+                {
+                  CmtError::set (CmtError::package_not_found, use.get_info ());
+                  return 0;
+                }
+            }
+          
+          Me.m_current_path = use.real_path;
+          Me.m_current_access = DeveloperMode;
+        }
+    }
+  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
+      //
+
+      Me.m_current_access = DeveloperMode;
+      //...
+      configure_current_dir ();
+      build_prefix (Me.m_current_package, Me.m_current_prefix);
+      build_config (Me.m_current_prefix, Me.m_current_config);
+    }
+
+  /*
+  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, "current package", 0);
+          tag->mark (use.get_package_name ());
+          //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 (CmtError::has_pending_error ()) return 0;
+
+  if (Me.m_debug) cout << "use_extra_file2> current_tag=" << Me.m_current_tag << endl;
+  return 1;
+}
+
+//----------------------------------------------------------
+int Cmt::apply_globals ()
+{
 
   /**
@@ -8131 +8870 @@
   Tag::restore_tree ();
 
-  return (1);
-}
-
-//----------------------------------------------------------
-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 (use.get_package_name ());
-          //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);
+  if (CmtError::has_pending_error ()) return 0;
+
+  return 1;
 }
 
@@ -9676 +10281 @@
 
 //----------------------------------------------------------
+/*
 void Cmt::set_current_access (AccessMode mode)
 {
@@ -9692 +10298 @@
   Me.m_scope_filtering_mode = mode;
 }
-
+*/
 //----------------------------------------------------------
 void Cmt::set_standard_macros ()
@@ -9836 +10442 @@
   builder.fill_for_constituent_macros ();
 }
-
+/*
 void Cmt::set_all_sets_done ()
 {
@@ -9846 +10452 @@
   Me.m_all_sets_done = false;
 }
-
+*/
 //----------------------------------------------------------
 void Cmt::use_cmt ()
@@ -9905 +10511 @@
   if (CmtSystem::test_file (f))
     {
-      use->m_located = true;
-    }
-  SyntaxParser::parse_requirements (f, use);
+      use->style = none_style;
+      use->structuring_style = without_version_directory;
+
+      if (name == CmtSystem::get_home_package () ||
+          name == CmtSystem::get_user_context_package ())
+        {
+          const Project::ProjectPtrVector& Ordered = Project::ordered_projects ();
+          if (0 == Ordered.size ())
+            {
+              if (m_cmt_context.m_use_projects)
+                {
+                  CmtError::set(CmtError::configuration_error,
+                                "No such ordered project: " + use->get_info ());
+                  return;
+                }
+              else
+                {
+                  use->change_path (path);
+                }
+            }
+          else
+            {
+              if (name == CmtSystem::get_home_package ())
+                use->change_path (path, Ordered[Ordered.size () - 1]);
+              else if (name == CmtSystem::get_user_context_package ())
+                use->change_path (path, Ordered[0]);
+            }
+        }
+      else
+        {
+          CmtMessage::verbose
+            (CmtError::get_error_name (CmtError::configuration_error)
+             + ": Unknown special use: " + use->get_info ());
+          use->change_path (path);
+        }
+      //      use->m_located = true;
+      SyntaxParser::parse_requirements (f, use);
+    }
+  else
+    {
+      use->discard ();
+    }
 
   Me.m_recursive = recursive_copy;
@@ -9922 +10567 @@
     {
       const cmt_string& s = v[i];
-      if (s == "") continue;
+      if (s.size () == 0) continue;
 
       if (result.size () != 0) result += separator;
       //if (i > 0) result += separator;
-      result += v[i];
+      result += s;
     }
 }