Changeset 608 for CMT/HEAD/source/cmt_project.cxx

Timestamp:

Apr 5, 2012, 1:43:26 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 483

File:

• CMT/HEAD/source/cmt_project.cxx (modified) (3 diffs)

CMT/HEAD/source/cmt_project.cxx

@@ -987 +987 @@
 
   Use& use = Use::current();
-  cmt_string current_path (Cmt::get_current_dir ());
+  cmt_string current_path;
+  cmt_string current_path_real;
   if (use.located ())
     {
-      current_path = use.real_path;
-      CmtMessage::verbose ("Using current use real_path `" + current_path + "'");
-    }
-
-  cmt_string current_path_real;
-  if (!CmtSystem::realpath_ (current_path, current_path_real))
+      current_path_real = use.get_realpath ();
+      if (current_path_real.size ())
+        CmtMessage::verbose ("Using current use realpath `" + current_path_real + "'");
+      else
+        {
+          current_path = use.real_path;
+          CmtMessage::verbose ("Using current use real_path `" + current_path + "'");
+        }
+    }
+  else
+    current_path = Cmt::get_current_dir ();
+
+  if (0 == current_path_real.size () &&
+      !CmtSystem::realpath_ (current_path, current_path_real))
     {
       CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
@@ -1650 +1659 @@
 
 //----------------------------------------------------------
-cmt_string Project::find_in_cmt_paths (const cmt_string& path)
+cmt_string Project::find_in_cmt_paths (const cmt_string& path, bool realpath)
 {
   //const cmt_string pwd = CmtSystem::pwd ();
@@ -1657 +1666 @@
   cmt_string path_real;
   //cerr << "realpath_: find_in_cmt_paths" << endl;
-  if (!CmtSystem::realpath_ (path, path_real))
+  if (realpath)
+    path_real = path;
+  else if (!CmtSystem::realpath_ (path, path_real))
     return ("");