Changeset 474 for CMT/HEAD/source/cmt_generators.cxx

Timestamp:

Nov 18, 2008, 12:28:03 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 375

File:

• CMT/HEAD/source/cmt_generators.cxx (modified) (10 diffs)

CMT/HEAD/source/cmt_generators.cxx

@@ -351 +351 @@
   filter_path (m_FILEPATH.value);
 
+  /*
   m_LINE = m_FULLNAME.value;
   m_LINE += " ";
+  */
 
   filter_path (m_FULLNAME.value);
-  filter_path (m_LINE.value);
+  //  filter_path (m_LINE.value);
 
   CmtSystem::get_suffix (name, m_FILESUFFIX.value);
@@ -394 +396 @@
   if (m_PACKOS9)
     {
-      os9sources += m_LINE;
+      //      os9sources += m_LINE;
+      os9sources += m_FULLNAME.value;
       os9sources += " ";
     }
@@ -464 +467 @@
   const cmt_vector<cmt_regexp>& selects = constituent.select_exprs;
 
-  m_LINE = "";
+  //  m_LINE = "";
 
   for (i = 0; i < sources.size (); i++)
@@ -496 +499 @@
         }
 
+      /*
       if (count > 0)
         {
@@ -501 +505 @@
           m_LINE += " ";
         }
-    }
-
-  fill_outputs ();
+      */
+    }
+
+  fill_names_outputs ();
+  //fill_outputs ();
 
   prepare_use_context ();
@@ -942 +948 @@
   const cmt_vector<cmt_regexp>& selects = constituent.select_exprs;
 
-  m_LINE = "";
+  //  m_LINE = "";
 
   for (i = 0; i < sources.size (); i++)
@@ -960 +966 @@
       filter_path (full_name);
 
+      /*
       if (count > 0)
         {
@@ -965 +972 @@
           m_LINE += " ";
         }
+      */
 
       for (int j = 0; j < files.size (); j++)
@@ -977 +985 @@
     }
 
-  fill_outputs ();
+  fill_names_outputs ();
+  //  fill_outputs ();
 
   prepare_use_context ();
@@ -2743 +2752 @@
       // Get rid of files that may come from the makefile fragment
       if (file_name.find ("requirements") != cmt_string::npos) source_number--;
-      else if (file_name.substr (0, 5) == "-out=")
-        {
-          if (!all_sources) source_number--;
+      else if (file_name.substr (0, 5) == "-out=" ||
+               file_name.substr (0, 5) == "-out:" ||
+               file_name.substr (0, 5) == "/out:" ||
+               file_name.substr (0, 5) == "/out=")
+        {
+          source_number--;
           file_name.erase (0, 5);
           m_output_file_name = file_name;
         }
       else if (file_name.find (".make") != cmt_string::npos) source_number--;
-      else if (file_name == "-all_sources") 
+      else if (file_name == "-all_sources" ||
+               file_name == "/all_sources") 
         {
           source_number = sources.size ();
           all_sources = true;
         }
-      else if (file_name == "-no_stamps") 
-        {
-          if (!all_sources) source_number--;
+      else if (file_name == "-no_stamps" ||
+               file_name == "/no_stamps") 
+        {
+          source_number--;
           m_stamps = false;
         }