Changeset 363 for CMT

Timestamp:

Feb 1, 2007, 3:12:40 PM (18 years ago)

Author:

garonne

Message:

see C.L 322

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.cxx (modified) (2 diffs)
• source/cmt_constituent.cxx (modified) (3 diffs)
• source/cmt_error.cxx (modified) (7 diffs)
• source/cmt_error.h (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (6 diffs)

CMT/HEAD/ChangeLog

@@ -1 @@
-
+2007-01-02 Vincent Garonne <garonne@lal.in2p3.fr> 322
+
+        * source/cmt_parser.cxx:  update to deal with the action return status code
+         and the -no_auto_imports differents cases.
+        * source/cmt_constituents.cxx: Add support for the -import=PkgA, PkgB
+        * source/cmt_error.*: update to deal with the action return status code 
+        * source/cmt.cxx: return status code    
+        
 2007-31-01 Vincent Garonne <garonne@lal.in2p3.fr> 321
 

CMT/HEAD/source/cmt.cxx

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by garonne@lal.in2p3.fr
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
 
 #include "cmt.h"
+
+#include <stdlib.h>
 
 /*----------------------------------------------------------*/
@@ -12 +15 @@
 {
    //cout << "argc=" << argc << endl;
-
   int status = Cmt::parser (argc, argv);
-
+  if (status !=0) return -1;
   return (status);
 }

CMT/HEAD/source/cmt_constituent.cxx

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by garonne@lal.in2p3.fr
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -210 +211 @@
       }
     else if (w.substr (0, 8) == "-import=")
-      {
-        cmt_string& import = m_constituent.imports.add ();
-        w.substr (8, import);
+      {        
+            cmt_string text_imports;
+            w.substr (8, text_imports);
+
+            CmtSystem::cmt_string_vector imports;
+
+            CmtSystem::split (text_imports, ',', imports);
+
+            for (int i = 0; i < imports.size (); i++)
+            {
+                cmt_string& import = m_constituent.imports.add ();
+                import             = imports[i] ; 
+            }        
       }
     else if (w.substr (0, 7) == "-group=")
@@ -235 +246 @@
     else if (w.substr (0, 1) == "-")
       {
-        if (!Cmt::get_quiet ())
-          {
+           //if (!Cmt::get_quiet ())
+           //{
             cerr << "#CMT> Warning: bad option " 
                  << w << " in constituent " << m_constituent.name << endl;
             //CmtError::set (CmtError::execution_error, cmd);
-          }
+           //}
       }
     else if ((equal = w.find ("=")) != cmt_string::npos)

CMT/HEAD/source/cmt_error.cxx

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by garonne@lal.in2p3.fr
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -35 +36 @@
     error_names.add() = "unknown_command";
     error_names.add() = "project_release_conflict";
+    error_names.add() = "execution_failed";
+    m_execution_error = 0;
   }
 
@@ -45 +48 @@
     m_code = CmtError::ok;
     m_text = "";
+    m_execution_error = 0 ;
   }
 
-  void set (CmtError::code code, const cmt_string& text)
+  void set (CmtError::code code, const cmt_string& text, const int execution_error)
   {
     m_code = code;
     m_text = text;
+    m_execution_error = execution_error;
   }
 
@@ -56 +61 @@
   {
     return (m_code);
+  }
+
+  int get_last_execution_error ()
+  {
+      return m_execution_error;
   }
 
@@ -74 +84 @@
   cmt_string m_text;
   cmt_vector<cmt_string> error_names;
+  int m_execution_error;
 };
 
@@ -110 +121 @@
 
 //---------------------------------------------------------------
+int CmtError::get_last_execution_error ()
+{
+  Error& e = Error::instance ();
+
+  return (e.get_last_execution_error ());
+}
+
+//---------------------------------------------------------------
 const cmt_string& CmtError::get_error_name (code error)
 {
@@ -118 +137 @@
 
 //---------------------------------------------------------------
-void CmtError::set (code error, const cmt_string& text)
+void CmtError::set (code error, const cmt_string& text, const int execution_error)
 {
   Error& e = Error::instance ();
 
-  e.set (error, text);
+  e.set (error, text, execution_error);
 }
 

CMT/HEAD/source/cmt_error.h

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by garonne@lal.in2p3.fr
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -35 +36 @@
     cannot_remove_lock,
     conflicting_lock,
-    unknown_command,
-    project_release_conflict
+    unknown_command,    
+    project_release_conflict,
+    execution_failed
   } code;
-
+ 
+  
   static void clear ();
   static code get_last_error_code ();
   static bool has_pending_error ();
   static const cmt_string& get_error_name (code error);
-  static void set (code error, const cmt_string& text);
+  static void set (code error, const cmt_string& text, const int execution_error=0);
+
+  static int get_last_execution_error ();
+
   static cmt_string get_last_error ();
   static void print ();
+    
 };
 

CMT/HEAD/source/cmt_parser.cxx

@@ -2734 +2734 @@
       cout << "Execute action " << ap.arguments[0] << " => " << cmd << endl;
 
-      CmtSystem::execute (cmd);
+      int status = CmtSystem::execute (cmd);
+      if (status != 0)
+        CmtError::set (CmtError::execution_failed, ap.arguments[0], status);
+      
     }
 }
@@ -5763 +5766 @@
   if (CmtError::has_pending_error ())
     {
-      int code = CmtError::get_last_error_code ();
+      int code = CmtError::get_last_error_code ();      
+      if (code == CmtError::execution_failed)
+      {
+          code = CmtError::get_last_execution_error();
+      }   
+      
       if (!Me.m_quiet) CmtError::print ();
       clear ();
@@ -7154 +7162 @@
                     if (u->discarded) continue;
 
-                    Package* p = u->get_package ();
-                    if (p->is_cmt ()) continue;
+                            Package* p = u->get_package ();
+                            if (p->is_cmt ()) continue;
                     
                     u->fill_macro (buffer, "linkopts");
@@ -7197 +7205 @@
             
                 if (u->discarded) continue;
-
+                
                 if (Cmt::get_debug ())
                   {
@@ -7226 +7234 @@
         for (i = 0; i < base_auto_imports_states.size (); i++)
           {
-            if (auto_imports_states[i] != base_auto_imports_states[i])
-              {
+           
+            if (base_auto_imports_states[i]== On && auto_imports_states[i] == Off)
+               continue;
+           
+            //if (auto_imports_states[i] != base_auto_imports_states[i])
+            //  {
                 Use* u = Uses[i];
 
                 if (u->discarded) continue;
-
-                Package* p = u->get_package ();
-                if (p->is_cmt ()) continue;
+                if (u->m_hidden)  continue;
+
+                        Package* p = u->get_package ();
+                        if (p->is_cmt ()) continue;
 
                 if (Cmt::get_debug ())
@@ -7240 +7253 @@
                   }
 
-                if (u->auto_imports != Off) continue;
+                //if (u->auto_imports != Off) continue;
 
                 imports.push_back (u);
-              }
+             // }
           }