Changeset 519 for CMT/HEAD

Timestamp:

Sep 9, 2009, 3:33:30 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 406

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (5 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-09-09    <rybkin@lal.in2p3.fr> 406
+
+        * source/cmt_project.cxx: In function Project::ordered_projects, use static
+        for reference to Project::projects. In function Project::show_all, ensure
+        Project::ordered_projects is always invoked. In function Project::show,
+        output "v0" as version for CMTUSERCONTEXT, CMTHOME to be consistent with
+        "cmt show uses"
+        
 2009-08-10    <rybkin@lal.in2p3.fr> 405
 

CMT/HEAD/source/cmt_project.cxx

@@ -910 +910 @@
 {
   static ProjectPtrVector OrderedProjects;
-  if (0 != OrderedProjects.size ()) return OrderedProjects;
-
-  Project::ProjectVector& Projects = Project::projects ();
+
+  static Project::ProjectVector& Projects = Project::projects ();
   const int size = Projects.size ();
   
@@ -1081 +1080 @@
 void Project::show_all ()
 {
-  static const Project::ProjectPtrVector Ordered = Project::ordered_projects ();
+  const Project::ProjectPtrVector& Ordered = Project::ordered_projects ();
+  //  static const Project::ProjectPtrVector Ordered = Project::ordered_projects ();
   
   for (int i = 0; i < Ordered.size (); i++)
@@ -1088 +1088 @@
       p->m_visited = false;
     }
-
 
   Project* p = get_current ();
@@ -1191 +1190 @@
   if (arguments.size () == 0)
     {
-      const ProjectPtrVector Ordered = Project::ordered_projects ();
+      const ProjectPtrVector& Ordered = Project::ordered_projects ();
       for (int i = 0; i < Ordered.size (); i++)
         {
@@ -2247 +2246 @@
 
   for (int tab = 0; tab < level; tab++) cout << "  ";
-  cout << m_name << " " << m_release << " (in " << m_cmtpath << ")";
+  cout << m_name << " " << (m_name != "CMTUSERCONTEXT" && m_name != "CMTHOME" ? m_release : "v0") << " (in " << m_cmtpath << ")";
+  //  cout << m_name << " " << m_release << " (in " << m_cmtpath << ")";
 
   if (is_current) cout << " (current)";