Changeset 197

Timestamp:

Jun 2, 2006, 8:01:08 AM (18 years ago)

Author:

garonne

Message:

add the STRUCTURED_OUTPUT support on linux +mac

Location:

CMT/HEAD/source

Files:

• cmt_awk.cxx (modified) (1 diff)
• cmt_generators.cxx (modified) (4 diffs)
• cmt_generators.h (modified) (1 diff)
• cmt_system.h (modified) (1 diff)

CMT/HEAD/source/cmt_awk.cxx

@@ -598 +598 @@
   cmt_string compressed_path = path;
   CmtSystem::compress_path (compressed_path);
-  CmtSystem::realpath      (compressed_path, compressed_path);
+  CmtSystem::realpath      (compressed_path, compressed_path);  
   scan_path                (compressed_path, 0, a);
 

CMT/HEAD/source/cmt_generators.cxx

@@ -15 +15 @@
 {
   m_TITLE.set ("TITLE");
+  m_STRUCTURED_OUTPUT.set ("STRUCTURED_OUTPUT");
 
   make_header_fragment.set ("make_header");
@@ -140 +141 @@
   else if (language != Language::null ())
     {
-      obj  = "$(bin)";
-      if (Cmt::build_nmake ()) obj +=  m_CONSTITUENT;
-      if (Cmt::build_nmake ()) obj +=  CmtSystem::file_separator ();
+      obj  = "$(bin)";      
+
+      if (CmtSystem::getenv("STRUCTURED_OUTPUT")!="" || Cmt::build_nmake ())
+      {
+          obj +=  m_CONSTITUENT;
+          obj +=  CmtSystem::file_separator ();
+      }
+
       obj += name;
       obj += language.output_suffix;
@@ -507 +513 @@
       m_HASTARGETTAG = "has_no_target_tag";
     }
-
-  make_header_fragment.copy (m_output_file, constituent.variables, 7, 
-                             &m_TITLE,
+    
+  m_STRUCTURED_OUTPUT = "STRUCTURED_OUTPUT";
+
+  make_header_fragment.copy (m_output_file, constituent.variables, 8, 
+                                         &m_TITLE,
                              &m_CONSTITUENT,
                              &m_CONSTITUENTSUFFIX,
-                             &m_USER,
+                                         &m_USER,
                              &m_DATE,
                              &m_PACKAGE,
-                             &m_HASTARGETTAG);
+                                         &m_HASTARGETTAG,
+                                         &m_STRUCTURED_OUTPUT
+                             );
 
   if (need_prototypes)
@@ -2816 +2826 @@
             {
               const cmt_string& name = files[j];
-              
               if (name != "") 
                 {

CMT/HEAD/source/cmt_generators.h

@@ -21 +21 @@
 
   Variable m_TITLE;
+  Variable m_STRUCTURED_OUTPUT;
 
   FragmentHandle make_header_fragment;

CMT/HEAD/source/cmt_system.h

@@ -39 +39 @@
 
   // Resolve symbolic links in a path.
-  static BOOL realpath (const cmt_string& path, cmt_string& result);
+  static bool realpath (const cmt_string& path, cmt_string& result);
 
   static void dirname (const cmt_string& file_name, cmt_string& result);