Changeset 325

Timestamp:

Nov 15, 2006, 5:02:51 PM (18 years ago)

Author:

garonne

Message:

see C.L. 320

Location:

CMT/v1r20b1

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/group (modified) (1 diff)
• mgr/fragments/nmake/group (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_project.cxx (modified) (1 diff)

CMT/v1r20b1/ChangeLog

@@ +1 @@
+2006-15-11 Vincent Garonne <garonne@lal.in2p3.fr> 320
+
+    * mgr/fragments/group, mgr/fragments/nmake/group: Add macros $(${GROUP}_pre_constituents),  $(${GROUP}_post_constituents) for having target executed by default.
+    
 2006-14-11 Vincent Garonne <garonne@lal.in2p3.fr> 319
 

CMT/v1r20b1/mgr/fragments/group

@@ -3 +3 @@
 all_groups :: ${GROUP}
 
-${GROUP} :: $(${GROUP}_dependencies) $(${GROUP}_constituents)
+${GROUP} :: $(${GROUP}_dependencies)  $(${GROUP}_pre_constituents) $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
         @/bin/echo " ${GROUP} ok."
 

CMT/v1r20b1/mgr/fragments/nmake/group

@@ -2 +2 @@
 all_groups :: ${GROUP}
 
-${GROUP} :: $(${GROUP}_constituents)
+${GROUP} ::  $(${GROUP}_pre_constituents)  $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
         @echo " ${GROUP} ok."
 

CMT/v1r20b1/source/cmt_parser.cxx

@@ -7075 +7075 @@
 
     const Constituent::ConstituentVector& constituents =
-      Constituent::constituents ();
+    Constituent::constituents ();
 
   
     /// Prepare the auto_imports states in a vector
-
     cmt_vector<bool> base_auto_imports_states;
 
@@ -7123 +7122 @@
          */
 
-        if (constituent.type == Document) continue;
+        if (constituent.type == Document)
+        { 
+                 continue;
+        }   
         if (constituent.imports.size () == 0) 
           {

CMT/v1r20b1/source/cmt_project.cxx

@@ -1587 +1587 @@
                      // else if ? not possible
                  }
-             }                                                
+             }
          }
          else if (p == -1)