Changeset 428 for CMT/HEAD/source/cmt_generator.cxx

Timestamp:

Oct 31, 2007, 4:48:32 PM (17 years ago)

Author:

rybkin

Message:

See C.L. 334

File:

• CMT/HEAD/source/cmt_generator.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_generator.cxx

@@ -219 +219 @@
 //--------------------------------------------------
 bool CmtGenerator::prepare_output (const cmt_string& package,
-                                   const Constituent& constituent)
+                                   const Constituent& constituent,
+                                   const cmt_string& file)
 {
   m_PACKAGE = package;
@@ -238 +239 @@
     }
   
+  if (file != "") m_output_file_name = file;
+
   m_output_file_name += "new";
 
@@ -692 +695 @@
 
 //--------------------------------------------------
-int Generator::build_constituent_makefile (const Constituent& constituent)
+int Generator::build_constituent_makefile (const Constituent& constituent,
+                                           const cmt_string& file)
 {
   const cmt_string& package = Cmt::get_current_package ();
@@ -699 +703 @@
     {
     case Application:
-      ApplicationContext.build (package, constituent);
+      ApplicationContext.build (package, constituent, file);
       break;
     case Library:
-      LibraryContext.build (package, constituent);
+      LibraryContext.build (package, constituent, file);
       break;
     case Document:
-      DocumentContext.build (package, constituent);
+      DocumentContext.build (package, constituent, file);
       break;
     }
@@ -713 +717 @@
 
 //--------------------------------------------------
-void Generator::build_constituent_makefile (const cmt_string& name)
-{
+void Generator::build_constituent_makefile (const CmtSystem::cmt_string_vector& arguments)
+{
+  cmt_string name;
+  cmt_string file;
+
+  if (arguments.size () == 1)
+    {
+      file = "";
+      name = arguments[0];
+    }
+  else if (arguments.size () == 2) // arguments[0].substr (0, 5) == "-out="
+    {
+      cmt_string arg = arguments[0];
+      arg.erase (0, 5);
+      file = arg;
+      name = arguments[1];
+    }
+  else
+    {
+      cerr << "#CMT> build constituent_makefile : wrong arguments" << endl;
+      return;
+    }
+
   const Constituent* constituent = Constituent::find (name);
-  if (constituent != 0) build_constituent_makefile (*constituent);
+  if (constituent != 0) build_constituent_makefile (*constituent, file);
 }