Changeset 652 for CMT/HEAD/source/cmt_use.cxx

Timestamp:

Nov 5, 2013, 3:40:52 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 511

File:

• CMT/HEAD/source/cmt_use.cxx (modified) (20 diffs)

CMT/HEAD/source/cmt_use.cxx

@@ -1826 +1826 @@
   m_located = false;
   m_package = 0;
+  m_project = 0;
   m_index = -1;
 
@@ -1848 +1849 @@
       m_package = 0;
     }
+  m_project = 0;
 
   version   = "";
@@ -1923 +1925 @@
 
 //----------------------------------------------------------
-void Use::change_path (const cmt_string& new_path)
+void Use::change_path (const cmt_string& new_path, const Project* project)
 {
   // 
@@ -1929 +1931 @@
   // where this package/version has been found.
   //
+  if (Cmt::get_debug ())
+    {
+      cout << "|Use::change_path> path: " << new_path
+           << ": project: " << (project ? project->get_cmtpath () : "0")
+           << ": " << get_info () << endl;
+    }
 
   real_path = "";
   m_realpath = "";
 
-  if (new_path != "")
+  m_project = 0;
+
+  if (new_path.size () != 0)
+    //  if (new_path != "")
     {
       if ((path.size () > 0) &&
@@ -1951 +1962 @@
       if (!CmtSystem::realpath_ (real_path, m_realpath))
         {
-          CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
-                         real_path + "'");
+          CmtError::set (CmtError::file_access_error,
+                         "Cannot compute real path `" + real_path + "': " +
+                         get_info ());
           CmtError::print ();
           return;
@@ -1958 +1970 @@
     }
   
+  if (project)
+    m_project = project;
+
   m_located = true;
+
+  if (Cmt::get_debug ())
+    {
+      cout << "<Use::change_path| real_path: " << real_path
+           << ": m_project: " << (m_project ? m_project->get_cmtpath () : "0")
+           << ": " << get_info () << endl;
+    }
 }
 
@@ -2347 +2369 @@
           }
         
-        m_use->change_path (path);
+        m_use->change_path (path, &project);
 
         m_found = true;
@@ -2355 +2377 @@
     else if (m_use->alternate_versions.size () > 0)
       {
-        if (m_use->select_alternate ()) 
+        if (m_use->select_alternate (&project)) 
           {
             if (Cmt::get_debug ())
@@ -2448 +2470 @@
               cout << "move_to2> " << expanded_path << endl;
             }
-
           change_path (here);
-
           return (true);
         }
@@ -2461 +2481 @@
                   cout << "move_to5> " << real_path << endl;
                 }
-              
               return (true);
             }
         }
+
+      if (!CmtSystem::cd (here))
+        {
+          CmtError::set (CmtError::file_access_error, here);
+        }
       return (false);
 //     }
@@ -2482 +2506 @@
 
 //----------------------------------------------------------
-bool Use::select_alternate ()
+bool Use::select_alternate (const Project* project)
 {
   int i;
@@ -2567 +2591 @@
                 }
 
-              change_path (alternate_paths[selected_index]);
+              change_path (alternate_paths[selected_index], project);
               return (true);
             }
@@ -3568 +3592 @@
   offset = "";
 
-  cmtpath = m_realpath.size ()
-    ? Project::find_in_cmt_paths (m_realpath, true)
-    : Project::find_in_cmt_paths (real_path)
-    ;
-  const Project* p = Project::find_by_cmtpath (cmtpath);
-
+  const Project* p (0);
+  if (m_project)
+    {
+      p = m_project;
+      cmtpath = p->get_cmtpath ();
+    }
+  else
+    {
+      cmtpath = m_realpath.size ()
+        ? Project::find_in_cmt_paths (m_realpath, true)
+        : Project::find_in_cmt_paths (real_path)
+        ;
+      p = Project::find_by_cmtpath (cmtpath);
+  //  const Project* p = Project::find_by_cmtpath (cmtpath);
+    }
   //  if (cmtpath != "")
   if (p != 0)
@@ -3590 +3623 @@
       else if (!CmtSystem::realpath_ (real_path, offset))
         {
-          CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
-                         real_path + "'");
+          CmtError::set (CmtError::file_access_error,
+                         "Cannot compute real path `" + real_path + "': " +
+                         get_info ());
           CmtError::print ();
           return;
@@ -3705 +3739 @@
   buffer += "\n";
 
-  if (located ())
+  if (m_located)
+    //  if (located ())
     {
       buffer += "macro ";
@@ -3725 +3760 @@
           buffer += package_name;
         }
-      //      if (style != no_version_style)
       if (structuring_style == with_version_directory)
         {
@@ -3764 +3798 @@
   buffer += "\n";
   
-  Project* p = Project::find_by_cmtpath (cmtpath);
+  const Project* p (m_project);
+  if (!p)
+    p = Project::find_by_cmtpath (cmtpath);
 
   buffer += "macro ";
@@ -4829 +4865 @@
 
   return (is_in_path);
-}
-
-//----------------------------------------------------------
-bool Use::located () const
-{
-  return (m_located);
 }
 
@@ -5736 +5766 @@
 
 //----------------------------------------------------------
-Project* Use::get_project ()
+const Project* Use::get_project () const
 {    
+  if (m_project)
+    return m_project;
+
+  cmt_string cmtpath = m_realpath.size ()
+    ? Project::find_in_cmt_paths (m_realpath, true)
+    : Project::find_in_cmt_paths (real_path)
+    ;
+  return Project::find_by_cmtpath (cmtpath);
+  /*
   Project* p;
   cmt_string cmtpath = "";
@@ -5744 +5783 @@
   p = Project::find_by_cmtpath (cmtpath);
   return p;   
+  */
 }