Changeset 640 for CMT

Timestamp:

Jun 6, 2013, 3:27:38 PM (11 years ago)

Author:

rybkin

Message:

merge -r 629:630 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff, 1 prop)
• mgr/fragments/constituent (modified) (1 prop)
• mgr/fragments/constituent_lock (modified) (1 prop)
• mgr/fragments/jar (modified) (1 prop)
• mgr/fragments/java (modified) (1 prop)
• source/cmt_parser.cxx (modified) (4 diffs)
• source/cmt_project.cxx (modified) (1 prop)

CMT/v1r25-branch/ChangeLog

@@ +1 @@
+2013-01-28    <rybkin@lal.in2p3.fr> 501
+
+        * source/cmt_parser.cxx: In class Cmt functions print_symbol_names,
+        print_macros, exclude aliases when showing set names, sets, with same
+        result for commands "cmt show set_names", "cmt show sets"
+        
 2013-01-25    <rybkin@lal.in2p3.fr> 500
 

CMT/v1r25-branch/source/cmt_parser.cxx

@@ -7810 +7810 @@
       if (Me.m_action == action_show_macro_names)
         {
-          // Only keep macros.
+          // Keep macros,
+          // setup, cleanup scripts.
           if ((symbol.type == Symbol::SymbolSet) ||
               (symbol.type == Symbol::SymbolAlias) ||
@@ -7818 +7819 @@
       else if (Me.m_action == action_show_set_names)
         {
-          // Exclude macros, actions.
+          // Keep paths, sets,
+          // setup, cleanup scripts.
           if ((symbol.type == Symbol::SymbolMacro) ||
+              (symbol.type == Symbol::SymbolAlias) ||
               (symbol.type == Symbol::SymbolAction)) continue;
         }
@@ -7866 +7869 @@
       if (Me.m_action == action_show_macros)
         {
-          // Only keep macros.
+          // Keep macros,
+          // setup, cleanup scripts.
           if ((symbol.type == Symbol::SymbolSet) ||
               (symbol.type == Symbol::SymbolAlias) ||
@@ -7874 +7878 @@
       else if (Me.m_action == action_show_sets)
         {
-          // Exclude macros.
+          // Keep paths, sets,
+          // setup, cleanup scripts.
           if ((symbol.type == Symbol::SymbolMacro) ||
+              (symbol.type == Symbol::SymbolAlias) ||
               (symbol.type == Symbol::SymbolAction)) continue;
         }