Changeset 470 for CMT

Timestamp:

Oct 30, 2008, 4:22:54 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 371

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (8 diffs)
• source/cmt_project.h (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-10-30    <rybkin@lal.in2p3.fr> 371
+        
+        * source/cmt_project.h: In class IProjectVisitor, add method in_again to
+        be executed when the project is visited more then once. In class Project,
+        add method ordered_projects to return ProjectVector ordered according to
+        the CMTPATH entries, add method visit (IProjectVisitor&, ProjectPtrVector&),
+        add member m_visits to hold the number of times the project has been visited
+        * source/cmt_project.cxx: Implement method Project::ordered_projects,
+        implement method in_again in classes VisitorForFillCMTPATH,
+        VisitorForShowPaths. In Project::broadcast, Project::reverse_broadcast make
+        use of ordered_projects to ensure that cmtpath_pattern and
+        cmtpath_pattern_reverse are applied according to the order of the CMTPATH
+        entries. Implement method visit (IProjectVisitor&, ProjectPtrVector&) to
+        be used to visit the projects tree - the order is the projects upon which
+        the project depends directly, 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. In method Project::start_visit, make use of the visit
+        
 2008-10-29    <rybkin@lal.in2p3.fr> 370
         

CMT/HEAD/source/cmt_project.cxx

@@ -900 +900 @@
 }
 
+//----------------------------------------------------------
+Project::ProjectVector& Project::ordered_projects ()
+{
+  static ProjectVector OrderedProjects;
+  if (0 != OrderedProjects.size ()) return (OrderedProjects);
+
+  cmt_string s = Symbol::get_env_value ("CMTPATH");
+  CmtSystem::cmt_string_vector path_vector;
+  CmtSystem::split (s, CmtSystem::path_separator (), path_vector);
+
+  for (int i = 0; i < path_vector.size (); i++)
+    {
+      const cmt_string& path = path_vector[i];
+      Project* p = Project::find_by_cmtpath (path);
+      if (0 != p)
+        {
+          OrderedProjects.push_back (*p);
+        }
+      else
+        {
+          if (CmtMessage::active (Verbose))
+            CmtMessage::warning ("No project for CMTPATH entry `" + path + "'");
+        }
+    }
+
+  return (OrderedProjects);
+}
+
 /*----------------------------------------------------------*/
 void Project::clear_all ()
@@ -979 +1007 @@
     if (CmtSystem::test_directory (w))
       {
+        cout << "# Add path " << w << " from " << s << endl;
+      }
+  }
+
+  void in_again (Project* p)
+  {
+    const cmt_string& w = p->get_cmtpath_pwd ();
+    const cmt_string& s = p->get_cmtpath_source ();
+
+    if (s == "default path") return;
+
+    if (CmtSystem::test_directory (w))
+      {
+        cout << "# Remove path " << w << " from " << s << endl;
         cout << "# Add path " << w << " from " << s << endl;
       }
@@ -1046 +1088 @@
 void Project::broadcast (IProjectAction& action)
 {
-  static ProjectVector& Projects = projects ();
+  //  static ProjectVector& Projects = projects ();
+  static ProjectVector& Projects = ordered_projects ();
 
   for (int i = 0; i < Projects.size (); i++)
@@ -1059 +1102 @@
 void Project::reverse_broadcast (IProjectAction& action)
 {
-  static ProjectVector& Projects = projects ();
+  //  static ProjectVector& Projects = projects ();
+  static ProjectVector& Projects = ordered_projects ();
 
   for (int i = (Projects.size () - 1); i >= 0; i--)
@@ -1186 +1230 @@
 
 //----------------------------------------------------------
+void Project::visit (IProjectVisitor& visitor, ProjectPtrVector& projects)
+{
+  int size = projects.size ();
+  if (0 == size) return;
+
+  ProjectPtrVector children;
+  for (int j = 0; j < size; j++)
+    {
+      Project* p = projects[j];
+      if (20 == p->m_visits)
+        continue;
+      for (int i = 0; i < p->get_children_size (); i++)
+        {
+          Project* child = p->get_child (i);
+          if (0 == child->m_visits)       
+            visitor.in (child);
+          else
+            visitor.in_again (child);
+          child->m_visits++;
+          children.push_back (child);
+        }
+    }
+
+  visit (visitor, children);
+}
+
+//----------------------------------------------------------
 void Project::start_visit (IProjectVisitor& visitor)
 {
@@ -1194 +1265 @@
       Project& p = Projects[i];
       p.m_visited = false;
+      p.m_visits = 0;
     }
 
@@ -1205 +1277 @@
     }
 
-  visitor.pre (p);
-  p->visit (visitor);
-  visitor.post (p);
+  //  visitor.pre (p);
+  //p->visit (visitor);
+  //  visitor.post (p);
+  visitor.in (p);
+  p->m_visits++;
+  ProjectPtrVector projects;
+  projects.push_back (p);
+  visit (visitor, projects);
 }
 
@@ -1243 +1320 @@
     if (CmtSystem::test_directory (w))
       {
+        m_buffer += "path_append CMTPATH \"";
+        m_buffer += w;
+        m_buffer += "\" \n";
+      }
+  }
+
+  void in_again (Project* p)
+  {
+    const cmt_string& w = p->get_cmtpath_pwd ();
+    const cmt_string& s = p->get_cmtpath_source ();
+
+    if (s == "default path") return;
+
+    if (CmtSystem::test_directory (w))
+      {
+        m_buffer += "path_remove CMTPATH \"";
+        m_buffer += w;
+        m_buffer += "\" \n";
         m_buffer += "path_append CMTPATH \"";
         m_buffer += w;

CMT/HEAD/source/cmt_project.h

@@ -87 +87 @@
   virtual void pre (Project* p) = 0;
   virtual void in (Project* p) = 0;
+  virtual void in_again (Project* p) = 0;
   virtual void post (Project* p) = 0;
 };
@@ -108 +109 @@
 
   static ProjectVector& projects ();
+  static ProjectVector& ordered_projects ();
   static void clear_all ();
   static void show_all ();
@@ -189 +191 @@
   
   void   visit (IProjectVisitor& visitor);
+  static  void   visit (IProjectVisitor& visitor, ProjectPtrVector& projects);
   
   // Use
@@ -210 +213 @@
 
   bool m_visited;
+  int m_visits;
 
   cmt_string m_cmtpath;