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

Timestamp:

Jun 6, 2013, 4:16:59 PM (11 years ago)

Author:

rybkin

Message:

merge -r 631:635 HEAD

Location:

CMT/v1r25-branch

Files:

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

CMT/v1r25-branch/source/cmt_parser.cxx

@@ -3114 +3114 @@
     }
 
+  //  CmtSystem::cd ("..");
+  //  CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 
+
   cmt_string bin ("..");
   bin += CmtSystem::file_separator ();
   bin += Me.m_cmt_config;
-  //  CmtSystem::cd ("..");
-
-  CmtSystem::scan_dir (bin, expression, makes); 
-  //  CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 
+
+  if (CmtSystem::test_directory (bin))
+    // in case directory bin does not exist,
+    // this function scans the parent directory instead
+    CmtSystem::scan_dir (bin, expression, makes); 
+  else
+    makes.clear ();
     
   if (makes.size () > 0) 
@@ -3127 +3133 @@
         {
           cout << "Removing all previous make fragments from "
-               << Me.m_cmt_config << endl; 
+               << bin << endl; 
+          //           << Me.m_cmt_config << endl; 
         }