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

Timestamp:

Mar 8, 2011, 1:56:48 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 444

File:

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

CMT/HEAD/source/cmt_generators.cxx

@@ -230 +230 @@
   CmtSystem::basename (m_FULLNAME, m_FILENAME.value);
   
-  if (CmtSystem::test_file (m_FULLNAME))
-    {
+  //  if (CmtSystem::test_file (m_FULLNAME))
+  //    {
       java_fragment.copy (m_output_file, constituent.variables, 5,
                           &m_NAME,
@@ -238 +238 @@
                           &m_CONSTITUENT, 
                           &m_CONSTITUENTSUFFIX);
+      /*
     }
   else
@@ -244 +245 @@
       //      cerr << "#CMT> Warning: file " << m_FULLNAME << " not found" << endl;
     }
+      */
 }
 
@@ -514 +516 @@
   //fill_outputs ();
 
-  prepare_use_context ();
+  //prepare_use_context ();
 
   m_DATE = CmtSystem::now ();
@@ -986 +988 @@
       int count = get_all_files (full_name, excludes, selects, files);
 
-      filter_path (full_name);
+      //      filter_path (full_name);
 
       /*
@@ -1010 +1012 @@
   //  fill_outputs ();
 
-  prepare_use_context ();
+  //  prepare_use_context ();
 
   m_DATE = CmtSystem::now ();
@@ -1069 +1071 @@
   else
     {
+      /*
       for (i = 0; i < sources.size (); i++)
         {
@@ -1086 +1089 @@
             {
               const cmt_string& name = files[j];
-              
+      */              
+      for (i = 0; i < m_source_files.size (); i++)
+        {
+          SourceFile& file = m_source_files[i];
+          const cmt_string& name = file.name ();
               if (name != "") 
                 {
@@ -1101 +1108 @@
                            name.c_str ());
                 }
-            }
+              //            }
         }
     }
@@ -1118 +1125 @@
       CmtSystem::basename (file_name, m_FILENAME.value);
       CmtSystem::get_dot_suffix (m_FILENAME.value, m_FILESUFFIX.value);
-
+      /*
       if (!CmtSystem::test_file (file_name) && !CmtSystem::test_directory (file_name))
         {
           CmtMessage::warning ("Source file " + file_name + " not found");
-          //          cerr << "#CMT> Warning: Source file " << file_name << " not found" << endl;
-        }
-
+        }
+      */
       filter_path (m_FULLNAME.value);
 
@@ -1164 +1170 @@
                                       const cmt_string& output_suffix)
 {
-  static cmt_string output_dir;
+  //static cmt_string output_dir;
   static cmt_string suffix;
   static cmt_string name;
@@ -1172 +1178 @@
     {
       CmtMessage::warning ("Source file " + file + " not found");
-      //      cerr << "#CMT> Warning: Source file " << file << " not found" << endl;
-    }
-
-  CmtSystem::dirname (file, output_dir);
-  output_dir += CmtSystem::file_separator ();
-
-  filter_path (output_dir);
+    }
+
+  //CmtSystem::dirname (file, output_dir);
+  //output_dir += CmtSystem::file_separator ();
+
+  //filter_path (output_dir);
 
   CmtSystem::get_suffix (file, suffix);
@@ -2520 +2525 @@
 //--------------------------------------------------
 void ConstituentsMakefileGenerator::build (const cmt_string& package,
-                                           const CmtSystem::cmt_string_vector& arguments)
+                                           const cmt_string& file)
+//                                         const CmtSystem::cmt_string_vector& arguments)
 {
   reset ();
 
-  cmt_string file_name, dir_name;
-
-  if (arguments.size () > 0)
-    {
-      cmt_string arg = arguments[0];
-      if (arg.substr (0, 5) == "-out=")
-        {
-          arg.erase (0, 5);
-          file_name = arg;
-        }
-      else if (arg.substr (0, 8) == "-outdir=")
-        {
-          arg.erase (0, 8);
-          dir_name = arg;
-        }
-    }
+  cmt_string file_name (file);
+    //, dir_name;
+
+//   if (arguments.size () > 0)
+//     {
+//       cmt_string arg = arguments[0];
+//       if (arg.substr (0, 5) == "-out=")
+//      {
+//        arg.erase (0, 5);
+//        file_name = arg;
+//      }
+//       else if (arg.substr (0, 8) == "-outdir=")
+//      {
+//        arg.erase (0, 8);
+//        dir_name = arg;
+//      }
+//     }
 
   if (file_name == "")
@@ -2557 +2564 @@
     }
 
-  if (dir_name != "")
-    {
-      if (dir_name [dir_name.size () - 1] != CmtSystem::file_separator ())
-        dir_name += CmtSystem::file_separator ();
-      file_name = dir_name + file_name;
-    }
+//   if (dir_name != "")
+//     {
+//       if (dir_name [dir_name.size () - 1] != CmtSystem::file_separator ())
+//      dir_name += CmtSystem::file_separator ();
+//       file_name = dir_name + file_name;
+//     }
 
   cmt_string save_file_name = file_name;