Changeset 80 for CMT/HEAD/source/cmt_symbol.cxx

Timestamp:

Sep 1, 2005, 8:49:02 AM (19 years ago)

Author:

arnault

Message:

Bug fixes - see CL#276

File:

• CMT/HEAD/source/cmt_symbol.cxx (modified) (2 diffs)

CMT/HEAD/source/cmt_symbol.cxx

@@ -1247 +1247 @@
 
   static SymbolVector& Symbols = symbols ();
+  Use::UsePtrVector& Uses = Use::get_ordered_uses ();
 
   static CmtSystem::cmt_string_vector envs;
@@ -1278 +1279 @@
         }
     }
+
+  cmt_string cmtconfig = CmtSystem::get_cmt_config ();
+
+  if (Uses.size () > 0)
+    {
+      int number;
+
+      for (number = 0; number < Uses.size (); number++)
+        {
+          Use& use = *(Uses[number]);
+
+          if (use.discarded) continue;
+
+          if (use.get_package_name () == "cmt_standalone") continue;
+
+          if (Cmt::get_strategy ("SetupConfig", use))
+            {
+              cmt_string& temp = envs.add ();
+
+              temp = use.prefix;
+              temp += "CONFIG=";
+              temp += cmtconfig;
+            }
+
+          if (Cmt::get_strategy ("SetupRoot", use))
+            {
+              cmt_string& temp = envs.add ();
+
+              temp = use.prefix;
+              temp += "ROOT=";
+              temp += use.get_full_path ();
+            }
+        }
+    }
+
+  {
+    Use& use = Use::current ();
+
+    if (use.get_package_name () != "cmt_standalone")
+      {
+        if (Cmt::get_strategy ("SetupConfig", use))
+          {
+            cmt_string& temp = envs.add ();
+            
+            temp = use.prefix;
+            temp += "CONFIG=";
+            temp += cmtconfig;
+          }
+        
+        if (Cmt::get_strategy ("SetupRoot", use))
+          {
+            cmt_string& temp = envs.add ();
+            
+            temp = use.prefix;
+            temp += "ROOT=";
+            temp += use.get_full_path ();
+          }
+      }
+  }
 
   for (number = 0; number < Symbol::symbol_number (); number++)