Changeset 81

Timestamp:

Sep 1, 2005, 10:34:42 AM (19 years ago)

Author:

arnault

Message:

moving get_strategy to cmt_use - see CL#276

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (18 diffs)
• source/cmt_symbol.cxx (modified) (4 diffs)
• source/cmt_use.cxx (modified) (1 diff)
• source/cmt_use.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ -1 +1 @@
 2005-09-01  Christian Arnault  <arnault@lal.in2p3.fr> 276
 
-        * source/cmt_symbol.cxx (all_set): Generate all XXXROOT and XXXCONFIG evs accroding
+        * source/cmt_use.cxx (get_strategy): Implement the get_strategy function
+
+        * source/cmt_use.h (class Use): Install the get_strategy function as a member function.
+
+        * source/cmt_symbol.cxx (all_set): Generate all XXXROOT and XXXCONFIG evs according
         to the strategies.
 

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

@@ -150 +150 @@
   int m_count;
 };
-
-
-//----------------------------------------------------------
-bool Cmt::get_strategy (const cmt_string& name, Use& use)
-{
-  static cmt_string cmtpath;
-  static cmt_string offset;
-
-  use.get_cmtpath_and_offset (cmtpath, offset);
-
-  Project* p = Project::find_by_cmtpath (cmtpath);
-
-  bool strategy;
-
-  if (p == 0)
-    {
-      static const Project::ProjectVector& projects = Project::projects ();
-
-      if (projects.size () == 0) strategy = StrategyMgr::get_default_strategy (name);
-      else
-        {
-          p = &(projects[0]);
-          strategy = p->get_strategy (name);
-        }
-    }
-  else
-    {
-      strategy = p->get_strategy (name);
-    }
-
-  return (strategy);
-}
 
 //----------------------------------------------------------
@@ -1741 +1709 @@
   }
 
-  if (get_strategy ("InstallArea", current_use))
+  if (current_use.get_strategy ("InstallArea"))
     {
       const CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -2165 +2133 @@
     //  Try a cleanup of the installation area
     //
-  if (get_strategy ("InstallArea", current_use))
+  if (current_use.get_strategy ("InstallArea"))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -2171 +2139 @@
       //cout << "#IA3>" << endl;
 
-      if (get_strategy ("SetupCleanup", Use::current ()))
+      if (current_use.get_strategy ("SetupCleanup"))
         {
           ia_mgr.config ();
@@ -2903 +2871 @@
               Symbol::expand (libname);
 
-              if (get_strategy ("InstallArea", current_use))
+              if (current_use.get_strategy ("InstallArea"))
                 {
                   const CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -3103 +3071 @@
     //  Try a cleanup of the installation area
     //
-  if (get_strategy ("InstallArea", current_use))
+  if (current_use.get_strategy ("InstallArea"))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -3112 +3080 @@
 
       /*
-      if (get_strategy ("SetupCleanup", current_use))
+      if (current_use.get_strategy ("SetupCleanup"))
         {
           const cmt_string& installarea = ia_mgr.get_installarea ();
@@ -3679 +3647 @@
   cout << "Build strategy    : ";
 
-  if (get_strategy ("BuildPrototypes", current_use))
+  if (current_use.get_strategy ("BuildPrototypes"))
     {
       cout << "prototypes";
@@ -3688 +3656 @@
     }
   
-  if (get_strategy ("InstallArea", current_use))
+  if (current_use.get_strategy ("InstallArea"))
     {
       cout << " with_installarea";
@@ -3701 +3669 @@
   cout << "Setup strategy    : ";
   
-  if (get_strategy ("SetupConfig", current_use))
+  if (current_use.get_strategy ("SetupConfig"))
     {
       cout << "config";
@@ -3710 +3678 @@
     }
   
-  if (get_strategy ("SetupRoot", current_use))
+  if (current_use.get_strategy ("SetupRoot"))
     {
       cout << " root";
@@ -3719 +3687 @@
     }
   
-  if (get_strategy ("SetupCleanup", current_use))
+  if (current_use.get_strategy ("SetupCleanup"))
     {
       cout << " cleanup";
@@ -4180 +4148 @@
   cmt_string no_cleanup_opt;
 
-  if (get_strategy ("SetupCleanup", current_use))
+  if (current_use.get_strategy ("SetupCleanup"))
     {
       no_cleanup_opt = " -no_cleanup";
@@ -4374 +4342 @@
   cmt_string no_cleanup_opt;
 
-  if (get_strategy ("SetupCleanup", current_use))
+  if (current_use.get_strategy ("SetupCleanup"))
     {
       no_cleanup_opt = " -no_cleanup";
@@ -4713 +4681 @@
 {
   Use& current_use = Use::current ();
-  if (get_strategy ("BuildPrototypes", current_use)) return (true);
+
+  if (current_use.get_strategy ("BuildPrototypes")) return (true);
   else return (false);
 }
@@ -5756 +5725 @@
   cmt_string system = CmtSystem::get_cmt_config ();
 
-  bool do_config = get_strategy ("SetupConfig", use);
-  bool do_root = get_strategy ("SetupRoot", use);
+  bool do_config = use.get_strategy ("SetupConfig");
+  bool do_root = use.get_strategy ("SetupRoot");
 
   switch (mode)
@@ -7304 +7273 @@
     CmtPathPattern::apply_all ();
 
-    if (Cmt::get_strategy ("InstallArea", Use::current ()))
+    const Use& current_use = Use::current ();
+
+    if (current_use.get_strategy ("InstallArea"))
       {
         CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();
@@ -7438 +7409 @@
     //
   /*
-  if (get_strategy ("InstallArea", Use::current ()))
+  if (current_use.get_strategy ("InstallArea"))
     {
       CmtInstallAreaMgr& ia_mgr = CmtInstallAreaMgr::instance ();

CMT/HEAD/source/cmt_symbol.cxx

@@ -1294 +1294 @@
           if (use.get_package_name () == "cmt_standalone") continue;
 
-          if (Cmt::get_strategy ("SetupConfig", use))
+          if (use.get_strategy ("SetupConfig"))
             {
               cmt_string& temp = envs.add ();
@@ -1303 +1303 @@
             }
 
-          if (Cmt::get_strategy ("SetupRoot", use))
+          if (use.get_strategy ("SetupRoot"))
             {
               cmt_string& temp = envs.add ();
@@ -1319 +1319 @@
     if (use.get_package_name () != "cmt_standalone")
       {
-        if (Cmt::get_strategy ("SetupConfig", use))
+        if (use.get_strategy ("SetupConfig"))
           {
             cmt_string& temp = envs.add ();
@@ -1328 +1328 @@
           }
         
-        if (Cmt::get_strategy ("SetupRoot", use))
+        if (use.get_strategy ("SetupRoot"))
           {
             cmt_string& temp = envs.add ();

CMT/HEAD/source/cmt_use.cxx

@@ -2876 +2876 @@
 }
 
+//------------------------------------------------------------
+bool Use::get_strategy (const cmt_string& name) const
+{
+  Project* p = Project::find_by_cmtpath (real_path);
+
+  bool strategy;
+
+  if (p == 0)
+    {
+      static const Project::ProjectVector& projects = Project::projects ();
+
+      if (projects.size () == 0) strategy = StrategyMgr::get_default_strategy (name);
+      else
+        {
+          p = &(projects[0]);
+          strategy = p->get_strategy (name);
+        }
+    }
+  else
+    {
+      strategy = p->get_strategy (name);
+    }
+
+  return (strategy);
+}
+
 //----------------------------------------------------------
 void Use::fill_includes_macro (cmt_string& buffer) const

CMT/HEAD/source/cmt_use.h

@@ -89 +89 @@
   void reduce_path (cmt_string& s) const;
   void get_cmtpath_and_offset (cmt_string& cmtpath, cmt_string& offset) const;
+  bool get_strategy (const cmt_string& name) const;
 
   void fill_includes_macro (cmt_string& buffer) const;