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

Timestamp:

Mar 8, 2011, 5:02:59 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 445

File:

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

CMT/HEAD/source/cmt_parser.cxx

@@ -2876 +2876 @@
 
   CmtSystem::cmt_string_vector makes;
-  cmt_regexp expression ("[.]n?make(sav)?$");
+  cmt_regexp expression ("[.](n?make(sav|cmtsave)?|in)$");
+  //  cmt_regexp expression ("[.]n?make(sav)?$");
 
   CmtSystem::scan_dir (".", expression, makes);
@@ -2891 +2892 @@
           CmtSystem::split (s, '.', words);
           if (words.size()>=2)
-            if (CmtSystem::get_makefile_suffix () == "nmake" && words[1] == "nmake")
+            if (CmtSystem::get_makefile_suffix () == "nmake" &&
+                (words[1] == "nmake"|| words[1] == "nmakesav" || words[1] == "nmakecmtsave"))
               CmtSystem::remove_file (s);
-            else if (CmtSystem::get_makefile_suffix () == "make" && words[1] == "make")
+            else if (CmtSystem::get_makefile_suffix () == "make" &&
+                     (words[1] == "make" || words[1] == "makesav" || words[1] == "makecmtsave"))
               CmtSystem::remove_file (s);
         }
     }
-  
-
-  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 (makes.size () > 0) 
@@ -2917 +2923 @@
           CmtSystem::split (s, '.', words);
           if (words.size()>=2)
-            if (CmtSystem::get_makefile_suffix () == "nmake" && words[1] == "nmake")
+            if (CmtSystem::get_makefile_suffix () == "nmake" &&
+                (words[1] == "nmake"|| words[1] == "nmakesav" || words[1] == "nmakecmtsave"))
               CmtSystem::remove_file (s);
-            else if (CmtSystem::get_makefile_suffix () == "make" && words[1] == "make")
+            else if (CmtSystem::get_makefile_suffix () == "make" &&
+                     (words[1] == "make" || words[1] == "makesav" || words[1] == "makecmtsave"))
               CmtSystem::remove_file (s);
-        }    
-    } 
-
-  CmtSystem::cd (branch); 
-
+            else if (words.size() == 2 && words[1] == "in")
+              CmtSystem::remove_file (s);
+        }
+    }
+
+  //  CmtSystem::cd (branch); 
+
+  /*
   Use& use = Use::current ();
 
@@ -2946 +2957 @@
       return;
     }
-
+  */
+  Me.m_quiet = true;
   install_setup_scripts ();
   install_cleanup_scripts ();
@@ -6356 +6368 @@
 
   //  if (strlen (ap.extra_file.c_str ()) > 0) SyntaxParser::parse_requirements (ap.extra_file, (Use*) 0);
-  if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, (Use*) 0);
+  //  if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, (Use*) 0);
 
   //
@@ -6707 +6719 @@
           use_extra_file (ap.extra_file);
         use_user_context_requirements ();
+        if (strlen (ap.extra_line.c_str ()) > 0)
+          SyntaxParser::parse_requirements_text (ap.extra_line, "extra statement(s)", (Use*) 0);
         Me.m_warnings = w;
+        //if (strlen (ap.extra_line.c_str ()) > 0) SyntaxParser::parse_requirements_line (ap.extra_line, &(Use::current ()));
       }
       break;