Changeset 80 for CMT/HEAD

Timestamp:

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

Author:

arnault

Message:

Bug fixes - see CL#276

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt.nmake (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (21 diffs)
• source/cmt_symbol.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-09-01  Christian Arnault  <arnault@lal.in2p3.fr> 276
+
+        * source/cmt_symbol.cxx (all_set): Generate all XXXROOT and XXXCONFIG evs accroding
+        to the strategies.
+
+        * source/cmt_parser.cxx (get_strategy): Make the use argument of the function a required argument
+        ie suppress the default arg to Use::current ()
+        Prepare to migrate this function as a member function of Use
+
 2005-08-31  Christian Arnault  <arnault@lal.in2p3.fr> 275
+
+        * source/cmt.h (class Cmt): Making the get_strategy function a member function 
+        rather than a private local one
 
         * mgr/fragments/constituent (uninstall): Protect against missing un/install targets

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Wed Aug 31 14:53:11 2005  by carnault
+#   Generated Wed Aug 31 17:37:50 2005  by carnault
 #
 #====================================

CMT/HEAD/source/cmt.h

@@ -211 +211 @@
   static CmtScopeFilteringMode get_scope_filtering_mode ();
   static bool get_all_sets_done ();
+  static bool get_strategy (const cmt_string& name, Use& use);
 
   /// If a project file exists above the current directory we don't need CMTPATH

CMT/HEAD/source/cmt_parser.cxx

@@ -153 +153 @@
 
 //----------------------------------------------------------
-static bool get_strategy (const cmt_string& name, Use& use = Use::current())
+bool Cmt::get_strategy (const cmt_string& name, Use& use)
 {
   static cmt_string cmtpath;
@@ -1741 +1741 @@
   }
 
-  if (get_strategy ("InstallArea"))
+  if (get_strategy ("InstallArea", current_use))
     {
       const CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -2066 +2066 @@
     //Use::UsePtrVector& Uses = Use::get_ordered_uses ();
 
+  Use& current_use = Use::current ();
+
   if (Me.m_debug)
     {
@@ -2163 +2165 @@
     //  Try a cleanup of the installation area
     //
-  if (get_strategy ("InstallArea"))
+  if (get_strategy ("InstallArea", current_use))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -2169 +2171 @@
       //cout << "#IA3>" << endl;
 
-      if (get_strategy ("SetupCleanup"))
+      if (get_strategy ("SetupCleanup", Use::current ()))
         {
           ia_mgr.config ();
@@ -2901 +2903 @@
               Symbol::expand (libname);
 
-              if (get_strategy ("InstallArea"))
+              if (get_strategy ("InstallArea", current_use))
                 {
                   const CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -3092 +3094 @@
 void Cmt::do_setup (const ArgParser& ap)
 {
+  Use& current_use = Use::current ();
 
   do_check_configuration (ap);
@@ -3100 +3103 @@
     //  Try a cleanup of the installation area
     //
-  if (get_strategy ("InstallArea"))
+  if (get_strategy ("InstallArea", current_use))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -3109 +3112 @@
 
       /*
-      if (get_strategy ("SetupCleanup"))
+      if (get_strategy ("SetupCleanup", current_use))
         {
           const cmt_string& installarea = ia_mgr.get_installarea ();
@@ -3649 +3652 @@
 void Cmt::do_show_strategies (const ArgParser& /*ap*/)
 {
+  Use& current_use = Use::current ();
+
   Project::show_specified_strategies_for_all ();
 
@@ -3674 +3679 @@
   cout << "Build strategy    : ";
 
-  if (get_strategy ("BuildPrototypes"))
+  if (get_strategy ("BuildPrototypes", current_use))
     {
       cout << "prototypes";
@@ -3683 +3688 @@
     }
   
-  if (get_strategy ("InstallArea"))
+  if (get_strategy ("InstallArea", current_use))
     {
       cout << " with_installarea";
@@ -3696 +3701 @@
   cout << "Setup strategy    : ";
   
-  if (get_strategy ("SetupConfig"))
+  if (get_strategy ("SetupConfig", current_use))
     {
       cout << "config";
@@ -3705 +3710 @@
     }
   
-  if (get_strategy ("SetupRoot"))
+  if (get_strategy ("SetupRoot", current_use))
     {
       cout << " root";
@@ -3714 +3719 @@
     }
   
-  if (get_strategy ("SetupCleanup"))
+  if (get_strategy ("SetupCleanup", current_use))
     {
       cout << " cleanup";
@@ -4171 +4176 @@
   cout << "Creating setup scripts." << endl;
 
+  Use& current_use = Use::current ();
   
   cmt_string no_cleanup_opt;
 
-  if (get_strategy ("SetupCleanup"))
+  if (get_strategy ("SetupCleanup", current_use))
     {
       no_cleanup_opt = " -no_cleanup";
@@ -4364 +4370 @@
   cout << "Creating setup scripts." << endl;
 
+  Use& current_use = Use::current ();
+
   cmt_string no_cleanup_opt;
 
-  if (get_strategy ("SetupCleanup"))
+  if (get_strategy ("SetupCleanup", current_use))
     {
       no_cleanup_opt = " -no_cleanup";
@@ -4704 +4712 @@
 bool Cmt::need_prototypes ()
 {
-  if (get_strategy ("BuildPrototypes")) return (true);
+  Use& current_use = Use::current ();
+  if (get_strategy ("BuildPrototypes", current_use)) return (true);
   else return (false);
 }
@@ -5747 +5756 @@
   cmt_string system = CmtSystem::get_cmt_config ();
 
-  bool do_config = get_strategy ("SetupConfig");
-  bool do_root = get_strategy ("SetupRoot");
+  bool do_config = get_strategy ("SetupConfig", use);
+  bool do_root = get_strategy ("SetupRoot", use);
 
   switch (mode)
@@ -7295 +7304 @@
     CmtPathPattern::apply_all ();
 
-    if (get_strategy ("InstallArea"))
+    if (Cmt::get_strategy ("InstallArea", Use::current ()))
       {
         CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -7429 +7438 @@
     //
   /*
-  if (get_strategy ("InstallArea"))
+  if (get_strategy ("InstallArea", Use::current ()))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();

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++)