Changeset 515 for CMT/HEAD

Timestamp:

Jul 15, 2009, 3:12:24 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 404

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (15 diffs)
• source/cmt_project.h (modified) (1 diff)
• source/cmt_system.cxx (modified) (3 diffs)
• source/cmt_use.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-07-15    <rybkin@lal.in2p3.fr> 404
+
+        * source/cmt_system.cxx: In function CMTPathManager::do_add_cmt_path, ensure
+        that CMTUSERCONTEXT or CMTHOME is not set as parent project for other
+        projects. In function CmtSystem::get_cmt_paths, create CMTUSERCONTEXT and/or
+        CMTHOME projects before projects from CMTPATH so that their source does not
+        change after sourcing a setup script
+        * source/cmt_project.h: In function Project::visit, add offset parameter
+        * source/cmt_project.cxx: In function ProjectFactory::create_project, do not
+        make CMTUSERCONTEXT or CMTHOME project top project because it has no parent,
+        or add it as child to the top project. In function
+        Project::ordered_projects, make CMTUSERCONTEXT first and CMTHOME last
+        project, if existent, with the child - the next, and the parent - last but
+        one project in order respectively. In functions Project::fill_selection,
+        Project::show_all make use of Project::ordered_projects. In function,
+        Project::visit, make use offset parameter, when reordering projects, put the
+        child project right after the parent project. In function Project::show,
+        ensure the project is shown once
+        * source/cmt_use.cxx: In function Use::get_strategy, fix the search of the
+        project for a use (in case the use has an offset), make use of function
+        Project::ordered_projects instead of Project::projects function
+        
 2009-07-01    <rybkin@lal.in2p3.fr> 403
         

CMT/HEAD/source/cmt_project.cxx

@@ +1 @@
+
 //-----------------------------------------------------------
 // Copyright Christian Arnault LAL-Orsay CNRS
@@ -543 +544 @@
       parent->update_strategies_from_children ();
     }
-  else
+  else if ((name != "CMTUSERCONTEXT") && (name != "CMTHOME"))
+    //  else
     {
       // this project has no parent thus it should become the top project.
@@ -552 +554 @@
         {
           Project* p = &(Projects[i]);
-          if (p->get_name () == name) continue;
+          const cmt_string& n = p->get_name ();
+          if (n == name) continue;
+          //      if (p->get_name () == name) continue;
+          if ((n == "CMTUSERCONTEXT") || (n == "CMTHOME")) continue;
           if (!p->has_parents ())
             {
@@ -908 +913 @@
 
   Project::ProjectVector& Projects = Project::projects ();
-  int size = Projects.size ();
+  const int size = Projects.size ();
   
+  int offset (0);
+  int iuser (-1);
+  int ihome (-1);
+  for (int i = 0; i < 2; i++)
+    {
+      if (offset < size)
+        {
+          const cmt_string& name = Projects[offset].get_name ();
+          if (name == "CMTUSERCONTEXT")
+            {
+              iuser = offset;
+              ++offset;
+            }
+          else if (name == "CMTHOME")
+            {
+              ihome = offset;
+              ++offset;
+            }
+          else
+            break;
+        }
+    }
+
+  OrderedProjects.resize (size);
+
   for (int i = 0; i < size; i++)
     {
       Project& p = Projects[i];
-      //    p.m_visited = false;
-      p.m_order = -1;
+      if (i >= offset)
+        p.m_order = -1;
+      else
+        p.m_order = -2;
       p.m_visits = 0;
     }
 
+  if (size == offset)
+    {
+      for (int i = 0; i < offset; i++)
+        {
+          Project* p = &(Projects[i]);
+          OrderedProjects[i] = p;
+        }
+      if (2 == offset)
+        {
+          OrderedProjects[0]->add_child (OrderedProjects[1]);
+          OrderedProjects[1]->add_parent (OrderedProjects[0]);
+          OrderedProjects[0]->update_strategies_from_children ();
+        }
+      return OrderedProjects;
+    }
+
   Project* p = get_current ();
 
+  //  cerr << "get_current: " << p << " offset: " << offset << endl;
   if (p == 0)
     {
-      if (0 == size) return OrderedProjects;
-
-      p = &(Projects[0]);
-    }
-
-  ProjectPtrVector projs;
+      p = &(Projects[offset]);
+      //      p = &(Projects[0]);
+    }
+  //  cerr << "p: " << p << " offset: " << offset << " name: " << p->get_name () << endl;
 
   int order (-1);
-  p->m_order = ++order;
-  p->m_visits++;
-  projs.push_back (p);
-
-  visit (order, projs);
-
-  OrderedProjects.resize (order + 1);
-  for (int i = 0; i < size; i++)
+
+  if ((p->get_name () != "CMTUSERCONTEXT") && (p->get_name () != "CMTHOME"))
+    {
+      ProjectPtrVector projs;
+      p->m_order = ++order;
+      //      p->m_visits++;
+      projs.push_back (p);
+      
+      visit (offset, order, projs);
+      //  visit (order, projs);
+    }
+  //  cerr << "order: " << order << endl;
+  //  int unordered = size - offset - (order + 1);
+
+  int beg (0);
+  if  (-1 != iuser)
+    {
+      OrderedProjects[0] = &(Projects[iuser]);
+      //      cerr << "OrderedProjects[0]: " << (OrderedProjects[0])->get_name () << endl;
+      ++beg;
+    }
+
+  int noorder (0);
+  for (int i = offset; i < size; i++)
+    //  for (int i = 0; i < size; i++)
     {
       Project* p = &(Projects[i]);
@@ -943 +1007 @@
       if (-1 == j)
         {
+          OrderedProjects[beg + order + 1 + noorder++] = p;
+          //      cerr << "no: OrderedProjects[" << beg + order + noorder << "]: " << (OrderedProjects[beg + order + noorder])->get_name () << endl;
+          //      OrderedProjects[order + 1 + noorder++] = p;
+          /*
           if (CmtMessage::active (Verbose))
             CmtMessage::warning ("Not ordered project " + p->get_name () +
@@ -948 +1016 @@
                                  " from " + p->get_cmtpath_source ());
           continue;
-        }
-      OrderedProjects[j] = p;
+          */
+        }
+      else if  (-2 == j)
+        {
+        }
+      else
+        {
+          OrderedProjects[beg + j] = p;
+      //      OrderedProjects[j] = p;
+          //      cerr << "OrderedProjects[" << beg + j << "]: " << (OrderedProjects[beg + j])->get_name () << endl;
+        }
+    }
+
+  if  (-1 != ihome)
+    {
+      OrderedProjects[size - 1] = &(Projects[ihome]);
+    }
+
+  if  (-1 != iuser)
+    {
+      OrderedProjects[0]->add_child (OrderedProjects[1]);
+      OrderedProjects[1]->add_parent (OrderedProjects[0]);
+      OrderedProjects[0]->update_strategies_from_children ();
+    }
+
+  if  (-1 != ihome)
+    {
+      /*
+      cerr << "beg: " << beg << " order: " << order << endl;
+      cerr << "noorder: " << noorder << " size - offset: " << size - offset << endl;
+      */
+      if (noorder != size - offset)
+        {  // the last ordered project
+          OrderedProjects[beg + order]->add_child (OrderedProjects[size - 1]);
+          OrderedProjects[size - 1]->add_parent (OrderedProjects[beg + order]);
+          OrderedProjects[beg + order]->update_strategies_from_children ();
+        }
+      else
+        {
+          OrderedProjects[size - 2]->add_child (OrderedProjects[size - 1]);
+          OrderedProjects[size - 1]->add_parent (OrderedProjects[size - 2]);
+          OrderedProjects[size - 2]->update_strategies_from_children ();
+        }
     }
 
@@ -972 +1081 @@
 void Project::show_all ()
 {
+  static const Project::ProjectPtrVector Ordered = Project::ordered_projects ();
+  
+  for (int i = 0; i < Ordered.size (); i++)
+    {
+      Project* p = Ordered[i];
+      p->m_visited = false;
+    }
+
+
+  Project* p = get_current ();
+
+  if (p == 0)
+    {
+      if (Ordered.size () == 0) return;
+
+      p = Ordered[0];
+    }
+  /*
   static Project::ProjectVector& Projects = Project::projects ();
   
@@ -988 +1115 @@
       p = &(Projects[0]);
     }
+  */
 
   p->show ();
@@ -1080 +1208 @@
   else if (arguments.size () == 1 && cmt_string (arguments[0]) == "-d")
     {
+      const ProjectVector& Projects = projects ();
+      for (int i = 0; i < Projects.size (); i++)
+        {
+          Project& p = Projects[i];
+          const cmt_string& w = p.get_cmtpath_pwd ();
+          const cmt_string& s = p.get_cmtpath_source ();
+          
+          if (s == "default path") continue;
+          
+          if (CmtSystem::test_directory (w))
+            {
+              cout << "# Create path " << w << " from " << s << endl;
+            }
+        }
+      /*
       VisitorForShowPaths visitor;
       start_visit (visitor);
+      */
     }
   else
@@ -1098 +1242 @@
 void Project::fill_selection (int depth, CmtSystem::cmt_string_vector& path_selections)
 {
+  static ProjectPtrVector Ordered = Project::ordered_projects ();
+  for (int i = 0; i < Ordered.size (); i++)
+    {
+      const Project* project = Ordered[i];
+
+      const cmt_string& p = project->get_cmtpath ();
+      const cmt_string& pwd = project->get_cmtpath_pwd ();
+      const cmt_string& p_real = project->get_cmtpath_real ();
+      const cmt_string& src = project->get_cmtpath_source ();
+      /*
   static ProjectVector& Projects = projects ();
 
@@ -1108 +1262 @@
       const cmt_string& p_real = project.get_cmtpath_real ();
       const cmt_string& src = project.get_cmtpath_source ();
-
+      */
       if (src != "default path")
         {
@@ -1329 +1483 @@
  *  then the direct dependencies of the of the first dependency, of the second
  *  dependency and so on. That is first left to right, then downwards.
+ *  @param offset the offset from which to use all the projects
  *  @param order the order of the last project visited
  *  @param projs vector of projects to visit and order
  */
-void Project::visit (int& order, ProjectPtrVector& projs)
+void Project::visit (const int offset, int& order, ProjectPtrVector& projs)
 {
   int size = projs.size ();
   if (0 == size) return;
   static ProjectVector& all = Project::projects ();
-
+  /*
+  cerr << "@ visit: " << order;
+  for (int j = 0; j < size; j++)
+    {
+      Project* p = projs[j];
+      cerr << " " << p->get_name ();
+    }
+  cerr << " @" << endl;
+  */
   ProjectPtrVector children;
   for (int j = 0; j < size; j++)
     {
       Project* p = projs[j];
+      p->m_visits++;
       // Avoid looping in case of circular project dependencies
-      if (100 <= p->m_visits)
+      if (500 <= p->m_visits)
+        //      if (100 <= p->m_visits)
         continue;
       for (int i = 0; i < p->get_children_size (); i++)
@@ -1349 +1514 @@
           Project* child = p->get_child (i);
           const int chorder = child->m_order;
-          if (-1 == chorder) // not ordered yet, i.e. visited for the first time
-            child->m_order = ++order;
-          else
-            { // ordered already, want to put it last in the order
-              for (int k = 0; k < all.size (); k++)
+          const int porder = p->m_order;
+          /*
+          cerr << ">>> " << p->get_name () << " child: " << i << endl;
+          cerr << child->get_name () << " in: " << chorder << endl;
+          */
+          if (-2 == chorder)
+            continue;
+          else if (-1 == chorder)
+            { // not ordered yet, i.e. visited for the first time
+              child->m_order = ++order;
+            }
+          else if (0 == chorder)
+            { // the project we started with, i. e. the current project:
+              //     o circular dependency
+              //     o do want to keep it first no matter what
+              if (CmtMessage::active (Verbose))
+                CmtMessage::warning ("Circular dependency on project: "
+                                     + child->get_name ()
+                                     + " " + child->get_release ()
+                                     + " " + child->get_cmtpath ());
+            }
+          else if ((0 < chorder) && (chorder < porder))
+            { // ordered already, want to put it after the parent in the order
+              for (int k = offset; k < all.size (); k++)
                 {
                   Project& q = all[k];
-                  if (q.m_order == chorder)
-                    q.m_order = order;
-                  else if (q.m_order > chorder)
+                  if (&q == child)
+                    {// the child we are putting after the parent in the order
+                      q.m_order = porder;
+                      //     cerr << "Moved back: " << q.get_name () << " order: " << q.m_order << endl;
+                    }
+                  else if ((chorder < q.m_order) && (q.m_order <= porder))
                     q.m_order--;
                 }
             }
-          child->m_visits++;
-          children.push_back (child);
-        }
-    }
-
-  visit (order, children);
+          //      cerr << child->get_name () << " out: " << child->m_order << endl;
+          //      child->m_visits++;
+          bool unknown (true);
+          for (int j = 0; j < children.size (); j++)
+            {
+              if (children[j] == child)
+                {
+                  unknown = false;
+                  break;
+                }
+            }
+          if (unknown)
+            {
+              children.push_back (child);
+            }
+        }
+    }
+
+  visit (offset, order, children);
 }
 
@@ -2025 +2225 @@
 void Project::show ()
 {
+  if (m_visited) return;
+  m_visited = true;
+
   static int level = 0;
 
@@ -2066 +2269 @@
   cout << endl;
 
+/*
   if (m_visited) return;
 
   m_visited = true;
+*/
 
   for (i = 0; i < m_children.size (); i++)

CMT/HEAD/source/cmt_project.h

@@ -193 +193 @@
   void   visit (IProjectVisitor& visitor);
   static  void   visit (IProjectVisitor& visitor, ProjectPtrVector& projects);
-  static  void   visit (int& order, ProjectPtrVector& projects);
+  static  void   visit (const int offset, int& order, ProjectPtrVector& projects);
   
   // Use

CMT/HEAD/source/cmt_system.cxx

@@ -1407 +1407 @@
 
         m_project = factory.create_project (project_name, npath, path_source, m_project);
+        if ((path_source == "CMTUSERCONTEXT") ||
+            (path_source == "CMTHOME"))
+          {
+            m_project = 0;
+          }
       }
   }
@@ -1498 +1503 @@
   CMTPathManager::reset ();
 
+  CMTPathManager::add_cmt_path (cmt_user_context, "CMTUSERCONTEXT", factory);
+  CMTPathManager::add_cmt_path (cmt_home, "CMTHOME", factory);
+  /*
   if (init_text != "")
     {
       add_cmt_paths_from_text (init_text, "initialization", factory);
     }
+  */
 
 #ifdef WIN32
@@ -1603 +1612 @@
   add_cmt_paths_from_file (rc_name, factory);
 
+  /*
   CMTPathManager::add_cmt_path (cmt_user_context, "CMTUSERCONTEXT", factory);
   CMTPathManager::add_cmt_path (cmt_home, "CMTHOME", factory);
+  */
+  if (init_text != "")
+    {
+      add_cmt_paths_from_text (init_text, "initialization", factory);
+    }
 }
 

CMT/HEAD/source/cmt_use.cxx

@@ -2943 +2943 @@
 bool Use::get_strategy (const cmt_string& name) const
 {
-  Project* p = Project::find_by_cmtpath (real_path);
+  const Project* p = Project::find_by_cmtpath (Project::find_in_cmt_paths (real_path));
 
   bool strategy;
@@ -2949 +2949 @@
   if (p == 0)
     {
-      static const Project::ProjectVector& projects = Project::projects ();
-
-      if (projects.size () == 0) strategy = StrategyMgr::get_default_strategy (name);
+      static const Project::ProjectPtrVector Ordered = Project::ordered_projects ();
+      //static const Project::ProjectVector& projects = Project::projects ();
+
+      if (Ordered.size () == 0) strategy = StrategyMgr::get_default_strategy (name);
+      //if (projects.size () == 0) strategy = StrategyMgr::get_default_strategy (name);
       else
         {
-          p = &(projects[0]);
+          p = Ordered[0];
+          //p = &(projects[0]);
           strategy = p->get_strategy (name);
         }