Changeset 660 for CMT

Timestamp:

Dec 13, 2013, 3:47:35 PM (10 years ago)

Author:

rybkin

Message:

See C.L. 519

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-12-13    <rybkin@lal.in2p3.fr> 519
+
+        * source/cmt_symbol.cxx: In class Symbol function action, fully resolve
+        setup, cleanup script path except for setup, cleanup shell script
+        generation, in function print_clean, use unalias command to remove alias
+        with Bourne syntax shell, in function print, fully resolve set value, do
+        not mangle set, path name in Xml mode
+        * source/cmt_parser.cxx: In class Cmt function print_context, do not mangle
+        use prefix in Xml mode
+        
 2013-12-11    <rybkin@lal.in2p3.fr> 518
 

CMT/HEAD/source/cmt_parser.cxx

@@ -8108 +8108 @@
   switch (mode)
     {
+    case Xml :
     case Requirements :
       break;

CMT/HEAD/source/cmt_symbol.cxx

@@ -1108 +1108 @@
             {
               if (use->get_strategy ("SetupRoot") &&
-                  use->get_package_name () != "cmt_standalone")
+                  use->get_package_name () != "cmt_standalone" &&
+                  (action_setup == Cmt::get_action () ||
+                   action_cleanup == Cmt::get_action ()) &&
+                  Requirements != Cmt::get_print_mode () &&
+                  Xml != Cmt::get_print_mode ())
                 {
 #ifdef WIN32
@@ -1823 +1827 @@
             break;
           case Sh :
-            cout << "[ -z ${" << name << "+CMT} ] || unset " << name;
-          //            cout << "unset " << name;
+            cout << "alias " << name << " >/dev/null 2>&1 && unalias " << name;
             result = 1;
             break;
@@ -1898 +1901 @@
   bool empty = (temp.size () == 0) ? true : false;
 
+  cmt_string _name (name);
+  switch (type)
+    {
+    case SymbolSet :
+    case SymbolPath :
+      expand (temp);
+      if (type == SymbolPath)
+        {
+          if (!pb)
+            pb = static_cast<PathBuilder*> (builder);
+          pb->filter_path_value (*this, temp);
+        }
+      switch (mode)
+        {
+        case Xml :
+          break;
+        default:
+          if (0 != CmtSystem::mangle (name, _name))
+            CmtMessage::info ("Replace " + name + " with " + _name);
+          break;
+        }
+      break;
+    default:
+      break;
+    }
+
+  /*
   if (type == SymbolPath)
     {
@@ -1906 +1936 @@
       pb->filter_path_value (*this, temp);
     }
-
-  cmt_string _name;
+  */
   switch (type)
     {
       case SymbolSet :
       case SymbolPath :
-        if (0 != CmtSystem::mangle (name, _name))
-          CmtMessage::info ("Replace " + name + " with " + _name);
         switch (mode)
           {