Changeset 536 for CMT/HEAD

Timestamp:

Mar 26, 2010, 5:36:41 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 423

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_project.cxx (modified) (1 diff)
• source/cmt_use.cxx (modified) (5 diffs)
• source/cmt_use.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-03-26    <rybkin@lal.in2p3.fr> 423
+
+        * source/cmt_use.h: In function move_to, introduce second parameter curdir
+        with default value false to specify where to search for package: in current
+        directory or in CMTPATH entries
+        * source/cmt_use.cxx: Modify function move_to accordingly
+        * source/cmt_project.cxx: In function container_action, make use of move_to
+        to search for container in current directory only
+        * source/cmt_parser.cxx: In function reach_current_package, search for
+        package in current directory and in CMTPATH entries as it was
+        
 2010-03-26    <rybkin@lal.in2p3.fr> 422
 

CMT/HEAD/source/cmt_parser.cxx

@@ -7116 +7116 @@
   else if (Me.m_current_package != "")
     {
-      if (!use.move_to ())
+      if (!use.move_to () && !use.move_to ("", true))
+        //      if (!use.move_to ())
         {
           CmtError::set (CmtError::package_not_found,

CMT/HEAD/source/cmt_project.cxx

@@ -2243 +2243 @@
       use->get_package ()->remove_use (use);
       CmtSystem::cd (m_cmtpath_pwd);
-      if (use->move_to ())
-        {
-          cmt_string use_real;
-          bool ok (false);
-          if (!CmtSystem::absolute_path (use->path))
-            {
-              ok = CmtSystem::realpath_ (use->real_path, use_real);
-            }
-          else
-            {
-              ok = CmtSystem::realpath_ (use->path, use_real);
-            }
-          if (ok && use_real.find (m_cmtpath_real) != 0)
-            {
-              use->~Use ();
-            }
-          else if (!CmtSystem::absolute_path (use->real_path))
-            {
-              use->change_path (m_cmtpath_pwd);
-            }
+      if (use->move_to ("", true) &&
+          !CmtSystem::absolute_path (use->real_path))
+        {
+          use->change_path (m_cmtpath_pwd);
         }
       CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt");
     }
-  //  cerr << CmtSystem::pwd () << endl;
 
   set_container_name (name);

CMT/HEAD/source/cmt_use.cxx

@@ -1903 +1903 @@
 
 //----------------------------------------------------------
-bool Use::move_to (const cmt_string& native_version)
+bool Use::move_to (const cmt_string& native_version, bool curdir)
+//bool Use::move_to (const cmt_string& native_version)
 {
   if (m_located)
@@ -1924 +1925 @@
   cmt_string expanded_path = path;
 
+  if (curdir)
+    {
   //
   // Try here.
   //
-  if (expanded_path == "")
-    {
-      if (reach_package ("", native_version))
+//   if (expanded_path == "")
+//     {
+//       if (reach_package ("", native_version))
+      cmt_string here = CmtSystem::pwd ();
+      if (reach_package (here,  native_version))
         {
           if (Cmt::get_debug ())
@@ -1936 +1941 @@
             }
 
-          change_path (expanded_path);
+          change_path (here);
 
           return (true);
@@ -1952 +1957 @@
             }
         }
-    }
-      
+//     }
+    } // end of curdir      
+
   //
   // If the path specified in this use is a true absolute path,
@@ -1984 +1990 @@
         }
     }
+  if (curdir) return (false);
       
   //

CMT/HEAD/source/cmt_use.h

@@ -89 +89 @@
   void author_action (const CmtSystem::cmt_string_vector& words);
   void manager_action (const CmtSystem::cmt_string_vector& words);
-  bool move_to (const cmt_string& native_version="");
+  bool move_to (const cmt_string& native_version="", bool curdir = false);
+  //  bool move_to (const cmt_string& native_version="");
   void discard ();
   void undiscard ();