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

Timestamp:

Mar 26, 2010, 11:56:50 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 422

File:

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

CMT/HEAD/source/cmt_parser.cxx

@@ -532 +532 @@
   log << "configure_site_tag" << log_endl;
   configure_site_tag (0);
+  log << "configure_current_dir" << log_endl;
+  configure_current_dir ();
   log << "configure_home" << log_endl;
   // CMTHOME, CMTUSERCONTEXT and CMTPATH
   configure_home (0);
-  log << "configure_current_dir" << log_endl;
+  //  log << "configure_current_dir" << log_endl;
 
 
@@ -547 +549 @@
   Me.m_quiet = save_quiet;
 
-  configure_current_dir ();
+  //  configure_current_dir ();
 
   guess_current_project ();
@@ -4289 +4291 @@
   cout << "----------> uses" << endl;
   do_show_uses (ap);
+  // This is temporary to ensure that Make - which runs "cmt show setup" -
+  // does not fail for packages with unresolved uses
+  if (CmtError::get_last_error_code () == CmtError::package_not_found)
+    CmtError::clear ();
 
   cout << "----------> tags" << endl;
@@ -4571 +4577 @@
 }
 
+const cmt_string Cmt::get_current_dir_real ()
+{
+  cmt_string current_dir_real;
+  if (CmtSystem::realpath_ (Me.m_current_dir, current_dir_real))
+    return current_dir_real;
+  return (Me.m_current_dir);
+}
+
 const cmt_string& Cmt::get_current_package ()
 {
   return (Me.m_current_package);
+}
+
+const cmt_string& Cmt::get_current_path ()
+{
+  return (Me.m_current_path);
 }
 
@@ -8562 +8581 @@
 
 //----------------------------------------------------------
+void Cmt::set_recursive (bool mode)
+{
+  Me.m_recursive = mode;
+}
+
+//----------------------------------------------------------
 void Cmt::set_scope_filtering_mode (CmtScopeFilteringMode mode)
 {
@@ -8778 +8803 @@
   f += CmtSystem::file_separator ();
   f += file_name;
+  if (CmtSystem::test_file (f))
+    {
+      use->m_located = true;
+    }
   SyntaxParser::parse_requirements (f, use);