Changeset 9

Timestamp:

Mar 4, 2005, 6:20:46 PM (19 years ago)

Author:

arnault

Message:

Temporary step for project management

Location:

CMT/v1r19

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_commands.cxx (modified) (2 diffs)
• source/cmt_commands.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (6 diffs)
• source/cmt_project.cxx (modified) (24 diffs)
• source/cmt_project.h (modified) (8 diffs)
• source/cmt_system.cxx (modified) (8 diffs)
• source/cmt_system.h (modified) (2 diffs)

CMT/v1r19/ChangeLog

@@ +1 @@
+2005-03-04  Christian Arnault  <arnault@lal.in2p3.fr> 256
+
+        * source/cmt_project.cxx: Ongoing work for redefining Project graphs. 
+
 2005-03-03  Christian Arnault  <arnault@lal.in2p3.fr> 255
 

CMT/v1r19/source/cmt.h

@@ -64 +64 @@
   bool m_standard_macros_done;
   bool m_all_sets_done;
+
+  bool m_autoconfigure_cmtpath;
 };
 

CMT/v1r19/source/cmt_commands.cxx

@@ -178 +178 @@
   parsers.add ("--version", i);
   pv.push_back (&ArgParser::do_version); i++;
-
-  parsers.add ("+p", i);
-  parsers.add ("+pa", i);
-  parsers.add ("+pat", i);
-  parsers.add ("+path", i);
-  pv.push_back (&ArgParser::do_add_path); i++;
 
   parsers.add ("-b", i);
@@ -1550 +1544 @@
 {
   cmt.m_action = action_version;
-}
-
-void ArgParser::do_add_path ()
-{
-  cmt_string here = CmtSystem::pwd ();
-
-  if (CmtSystem::cd (arg))
-    {
-      arg = CmtSystem::pwd ();
-
-      //cerr << "Adding path " << arg << endl;
-
-      IProjectFactory& factory = ProjectFactory::instance ();
-      CmtSystem::add_cmt_path (arg, "argument", factory);
-      CmtSystem::cd (here);
-    }
 }
 

CMT/v1r19/source/cmt_commands.h

@@ -57 +57 @@
   void do_unlock ();
   void do_version ();
-  void do_add_path ();
   void option_help ();
   void option_n ();

CMT/v1r19/source/cmt_parser.cxx

@@ -89 +89 @@
   m_current_structuring_style = with_version_directory;
   m_all_sets_done = false;
+  m_autoconfigure_cmtpath = false;
   m_debug = false;
   if (getenv ("CMTDEBUG") != 0) m_debug = true;
@@ -585 +586 @@
 void Cmt::configure_cmt_path (Use* use)
 {
+  if (!Me.m_autoconfigure_cmtpath) return;
+
   cmt_string s;
 
@@ -611 +614 @@
   factory.reset ();
 
-  CmtSystem::get_cmt_paths (factory, s);
-
-  if (Me.m_cmt_user_context != "") factory.create_project (Me.m_cmt_user_context, "CMTUSERCONTEXT");
-  if (Me.m_cmt_home != "") factory.create_project (Me.m_cmt_home, "CMTHOME");
+  CmtSystem::get_cmt_paths (factory, s, Me.m_cmt_user_context, Me.m_cmt_home);
 }
 
@@ -3909 +3909 @@
 
               IProjectFactory& factory = ProjectFactory::instance ();
-              factory.create_project (pwd, "CurrentProject");
+              factory.create_project (pwd, "CurrentProject", 0);
 
               /*
@@ -3939 +3939 @@
 
   cmt_string buffer = "path CMTPATH \n";
-  Project::set_cmtpaths (buffer);
+  Project::fill_cmtpaths (buffer);
   //cerr << "buffer = " << buffer << endl;
   Use& use = Use::current();
@@ -3946 +3946 @@
   SyntaxParser::parse_requirements_text (buffer, "", &use);
   Me.m_quiet = save_quiet;
+
+  Me.m_autoconfigure_cmtpath = true;
 }
 

CMT/v1r19/source/cmt_project.cxx

@@ -105 +105 @@
      - then it tries to read and parse its project file 
  */
-void ProjectFactory::create_project (const cmt_string& path,
-                                     const cmt_string& source)
+Project* ProjectFactory::create_project (const cmt_string& path,
+                                         const cmt_string& source,
+                                         Project* parent)
 {
   cmt_string compressed_path = path;
@@ -117 +118 @@
       Project& p = Projects[i];
       
-      if (p.get_cmtpath () == compressed_path) return;
-      if (p.get_cmtpath_pwd () == compressed_path) return;
+      if ((p.get_cmtpath () == compressed_path) ||
+          (p.get_cmtpath_pwd () == compressed_path))
+        {
+          if (parent != 0)
+            {
+              p.add_parent (parent);
+              parent->add_child (&p);
+            }
+          return (&p);
+        }
     }
   
@@ -127 +136 @@
   
   cmt_string here = CmtSystem::pwd ();
-  if (!CmtSystem::cd (compressed_path)) return;
+  if (!CmtSystem::cd (compressed_path)) return (0);
 
   cmt_string name;
@@ -187 +196 @@
   project = Project::add (name, release);
 
+  if (parent != 0)
+    {
+      project->add_parent (parent);
+      parent->add_child (project);
+    }
+
   if (source == "default path")
     {
@@ -216 +231 @@
     }
 
-  if (m_previous != 0) m_previous->set_predecessor (project);
-  m_previous = project;
-
   if (text != "")
     {
@@ -229 +241 @@
 
   CmtSystem::cd (here);
+
+  return (project);
 }
 
@@ -374 +388 @@
         Project& p = Projects.add ();
 
-        project->set_reference (&p);
         p.set_name (name);
         p.set_release (release);
@@ -417 +430 @@
 void Project::show_all ()
 {
+  /*
   static ProjectVector& Projects = projects ();
 
@@ -424 +438 @@
       project.show ();
     }
-}
+  */
+
+  static Project::ProjectVector& Projects = Project::projects ();
+  
+  for (int i = 0; i < Projects.size (); i++)
+    {
+      Project& p = Projects[i];
+      p.m_visited = false;
+    }
+
+  Project* current = get_current ();
+
+  current->show ();
+  
+
+}
+
+class VisitorForShowPaths : public IProjectVisitor
+{
+public:
+  VisitorForShowPaths ()
+  {
+  }
+
+  void pre (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 << "# Add path " << w << " from " << s << endl;
+      }
+  }
+
+  void in (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 << "# Add path " << w << " from " << s << endl;
+      }
+  }
+
+  void post (Project* p)
+  {
+  }
+};
 
 /*----------------------------------------------------------*/
 void Project::show_paths ()
 {
-  static ProjectVector& Projects = projects ();
-
-  if (!Cmt::get_quiet ())
-    {
-      for (int i = 0; i < Projects.size (); i++)
-        {
-          const Project& project = Projects[i];
-
-          const cmt_string& path   = project.get_cmtpath ();
-          const cmt_string& source = project.get_cmtpath_source ();
-          
-          cout << "# Add path " << path << " from " << source << endl;
-        }
-      
-      cout << "#" << endl;
-    }
-
-  for (int i = 0; i < Projects.size (); i++)
-    {
-      const Project& project = Projects[i];
-      
-      const cmt_string& path   = project.get_cmtpath ();
-      const cmt_string& source = project.get_cmtpath_source ();
-
-      if (i > 0) cout << CmtSystem::path_separator ();
-
-      cout << path;
-    }
-
-  cout << endl;
+  VisitorForShowPaths visitor;
+
+  start_visit (visitor);
 }
 
@@ -598 +638 @@
 
 //----------------------------------------------------------
-void Project::set_cmtpaths (cmt_string& buffer)
+void Project::visit (IProjectVisitor& visitor)
+{
+  if (m_visited) return;
+  m_visited = true;
+
+  int i;
+
+  for (i = 0; i < get_children_size (); i++)
+    {
+      Project* child = get_child (i);
+
+      if (child->visited ()) continue;
+
+      visitor.in (child);
+    }
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      Project* child = m_children[i];
+      child->visit (visitor);
+    }
+}
+
+//----------------------------------------------------------
+void Project::start_visit (IProjectVisitor& visitor)
+{
+  static Project::ProjectVector& Projects = Project::projects ();
+  
+  for (int i = 0; i < Projects.size (); i++)
+    {
+      Project& p = Projects[i];
+      p.m_visited = false;
+    }
+
+  Project* p = get_current ();
+
+  if (p == 0) return;
+
+  visitor.pre (p);
+  p->visit (visitor);
+  visitor.post (p);
+}
+
+//----------------------------------------------------------
+class VisitorForFillCMTPATH : public IProjectVisitor
+{
+public:
+  VisitorForFillCMTPATH (cmt_string& buffer) : m_buffer (buffer)
+  {
+  }
+
+  void pre (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_append CMTPATH \"";
+        m_buffer += w;
+        m_buffer += "\" \n";
+      }
+  }
+
+  void in (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_append CMTPATH \"";
+        m_buffer += w;
+        m_buffer += "\" \n";
+      }
+  }
+
+  void post (Project* p)
+  {
+    //cerr << "Buffer = " << m_buffer << endl;
+  }
+
+private:
+  cmt_string& m_buffer;
+
+};
+
+//----------------------------------------------------------
+void Project::fill_cmtpaths (cmt_string& buffer)
 {
   /*
@@ -606 +738 @@
    */
 
-  static ProjectVector& Projects = projects ();
-
-  for (int i = 0; i < Projects.size (); i++)
-    {
-      const Project& project = Projects[i];
-
-      const cmt_string& p = project.m_cmtpath;
-      const cmt_string& w = project.m_cmtpath_pwd;
-      const cmt_string& s = project.m_cmtpath_source;
-
-      if (s == "default path") continue;
-
-      if (CmtSystem::test_directory (w))
-        {
-          buffer += "path_append CMTPATH \"";
-          buffer += w;
-          buffer += "\" \n";
-        }
-    }
-}
-
-//----------------------------------------------------------
-Project::Project () : m_name (""), m_reference (0), m_predecessor (0)
+  VisitorForFillCMTPATH visitor (buffer);
+
+  start_visit (visitor);
+}
+
+//----------------------------------------------------------
+Project::Project () : m_name ("")
 {
   clear ();
@@ -664 +780 @@
 
 //----------------------------------------------------------
+int Project::get_children_size () const
+{
+  return (m_children.size ());
+}
+
+//----------------------------------------------------------
+Project* Project::get_child (int index) const
+{
+  if (index < 0) return (0);
+  if (index >= m_children.size ()) return (0);
+  return (m_children[index]);
+}
+
+//----------------------------------------------------------
+bool Project::visited () const
+{
+  return (m_visited);
+}
+
+//----------------------------------------------------------
 void Project::set_name (const cmt_string& name)
 {
   m_name = name;
-  configure ();
+  //configure ();
 }
 
@@ -692 +828 @@
 {
   m_cmtpath_source = source;
-}
-
-//----------------------------------------------------------
-void Project::set_predecessor (Project* predecessor)
-{
-  m_predecessor = predecessor;
-}
-
-//----------------------------------------------------------
-void Project::set_reference (Project* reference)
-{
-  m_reference = reference;
 }
 
@@ -714 +838 @@
   m_cmtpath_pwd = "";
   m_cmtpath_source = "";
+
+  m_parents.clear ();
+  m_children.clear ();
 
   m_build_strategy_mask = 0;
@@ -733 +860 @@
   m_setup_cleanup_tag = 0;
   m_setup_no_cleanup_tag = 0;
+}
+
+//----------------------------------------------------------
+void Project::add_parent (Project* p)
+{
+  if (p == 0) return;
+
+  int i;
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      Project* child = m_children[i];
+      if (child == 0) continue;
+
+      if (child->get_name () == p->get_name ())
+        {
+          // Already registered as a child (no cycle permitted!!)
+          return;
+        }
+    }
+
+  for (i = 0; i < m_parents.size (); i++)
+    {
+      Project* parent = m_parents[i];
+      if (parent == 0) continue;
+
+      if (parent->get_name () == p->get_name ())
+        {
+          // Already registered
+          return;
+        }
+    }
+
+  m_parents.push_back (p);
+}
+
+//----------------------------------------------------------
+void Project::add_child (Project* p)
+{
+  if (p == 0) return;
+
+  int i;
+
+  for (i = 0; i < m_parents.size (); i++)
+    {
+      Project* parent = m_parents[i];
+      if (parent == 0) continue;
+
+      if (parent->get_name () == p->get_name ())
+        {
+          // Already registered as a parent (no cycle permitted!!)
+          return;
+        }
+    }
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      Project* child = m_children[i];
+      if (child == 0) continue;
+
+      if (child->get_name () == p->get_name ())
+        {
+          // Already registered
+          return;
+        }
+    }
+
+  m_children.push_back (p);
 }
 
@@ -876 +1071 @@
           IProjectFactory& factory = ProjectFactory::instance ();
 
-          factory.create_project (p, "ProjectPath");
+          factory.create_project (p, "ProjectPath", this);
 
           break;
@@ -908 +1103 @@
 
 //----------------------------------------------------------
-void Project::show () const
-{
+void Project::show ()
+{
+  static int level = 0;
+
   bool is_current = false;
 
@@ -922 +1119 @@
     }
 
+  for (int tab = 0; tab < level; tab++) cout << "  ";
   cout << m_name << " " << m_release << " (in " << m_cmtpath << ")";
 
   if (is_current) cout << " (current)";
 
+  int i;
+
+  for (i = 0; i < m_parents.size (); i++)
+    {
+      Project* p = m_parents[i];
+      if (p == 0) continue;
+      cout << " P=" << p->get_name ();
+    }
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      Project* p = m_children[i];
+      if (p == 0) continue;
+      cout << " C=" << p->get_name ();
+    }
+
   cout << endl;
+
+  if (m_visited) return;
+
+  m_visited = true;
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      Project* p = m_children[i];
+      if (p == 0) continue;
+      level++;
+      p->show ();
+      level--;
+    }
 }
 
@@ -940 +1167 @@
   int result = 0;
 
+  /*
   if (m_reference != 0) result = m_reference->get_build_strategy ();
   else if (m_predecessor != 0) result = m_predecessor->get_build_strategy ();
   else result = Cmt::get_current_build_strategy ();
+  */
+
+  result = Cmt::get_current_build_strategy ();
 
   if (m_build_strategy_mask != 0)
@@ -958 +1189 @@
   int result = 0;
 
+  /*
   if (m_reference != 0) result = m_reference->get_setup_strategy ();
   else if (m_predecessor != 0) result = m_predecessor->get_setup_strategy ();
   else result = Cmt::get_current_setup_strategy ();
+  */
+
+  result = Cmt::get_current_setup_strategy ();
 
   if (m_setup_strategy_mask != 0)
@@ -1017 +1252 @@
     }
 
+  
+  /*
   static ProjectVector& Projects = projects ();
 
@@ -1032 +1269 @@
         }
     }
+      */
 
 }
@@ -1089 +1327 @@
     }
 
+  /*
   static ProjectVector& Projects = projects ();
 
@@ -1104 +1343 @@
         }
     }
-}
-
+  */
+}
+

CMT/v1r19/source/cmt_project.h

@@ -21 +21 @@
 public:
   void reset ();
-  void create_project (const cmt_string& path,
-                       const cmt_string& path_source);
+  Project* create_project (const cmt_string& path,
+                           const cmt_string& path_source,
+                           Project* parent);
 
 private:
@@ -36 +37 @@
 };
 
+class IProjectVisitor
+{
+public:
+  virtual void pre (Project* p) = 0;
+  virtual void in (Project* p) = 0;
+  virtual void post (Project* p) = 0;
+};
+
 class Project
 {
@@ -41 +50 @@
 
   typedef cmt_vector<Project> ProjectVector;
+  typedef cmt_vector<Project*> ProjectPtrVector;
 
   static void create (const cmt_string& name);
@@ -65 +75 @@
   static cmt_string find_in_cmt_paths (const cmt_string& path);
 
-  static void set_cmtpaths (cmt_string& buffer);
+  static void fill_cmtpaths (cmt_string& buffer);
+
+  static void start_visit (IProjectVisitor& visitor);
 
 public:
@@ -76 +88 @@
   const cmt_string& get_cmtpath_pwd () const;
   const cmt_string& get_cmtpath_source () const;
+  int get_children_size () const;
+  Project* get_child (int index) const;
+  bool visited () const;
+
   void set_name (const cmt_string& name);
   void set_release (const cmt_string& release);
@@ -81 +97 @@
   void set_cmtpath_pwd (const cmt_string& path);
   void set_cmtpath_source (const cmt_string& source);
-  void set_predecessor (Project* predecessor);
-  void set_reference (Project* reference);
   void clear ();
   void configure ();
+  void add_parent (Project* p);
+  void add_child (Project* p);
 
   void use_action (const cmt_string& name, const cmt_string& release);
@@ -92 +108 @@
   bool operator != (const cmt_string& name) const;
 
-  void show () const;
+  void show ();
   void show_strategies () const;
   int get_build_strategy () const;
@@ -99 +115 @@
   void set_setup_strategy (int mask, int strategy);
 
+  void visit (IProjectVisitor& visitor);
+
 private:
+
+  void fill_cmtpath (cmt_string& buffer);
+
   cmt_string m_name;
   cmt_string m_release;
 
-  Project* m_reference;
-  Project* m_predecessor;
+  ProjectPtrVector m_parents;
+  ProjectPtrVector m_children;
+
+  bool m_visited;
 
   cmt_string m_cmtpath;

CMT/v1r19/source/cmt_system.cxx

@@ -1229 +1229 @@
 
 //----------------------------------------------------------
-void CmtSystem::add_cmt_path (const cmt_string& path,
-                              const cmt_string& path_source,
-                              IProjectFactory& factory)
-{
-  cmt_string npath = path;
-
-  if (npath == "") return;
+//
+// This singleton interacts with the ProjectFactory to consistently create
+// the project graph.
+//
+// In particular a single-depth stack of the top project is maintained.
+//
+//----------------------------------------------------------
+class CMTPathManager
+{
+public:
+  static CMTPathManager& instance ();
+  static void reset ();
+  static void add_cmt_path (const cmt_string& path,
+                            const cmt_string& path_source,
+                            IProjectFactory& factory);
+
+private:
+  CMTPathManager () : m_project (0)
+  {
+  }
+
+  void do_reset ()
+  {
+    m_project = 0;
+  }
+
+  void do_add_cmt_path (const cmt_string& path,
+                        const cmt_string& path_source,
+                        IProjectFactory& factory)
+  {
+    cmt_string npath = path;
+
+    if (npath == "") return;
 
 #ifdef WIN32
-  if (npath.size () == 2)
-    {
-      if (npath[1] == ':')
-        {
-          npath += file_separator ();
-        }
-    }
-#endif
-
-  npath.replace_all ("\\", file_separator ());
-  npath.replace_all ("/", file_separator ());
-
-  if (!absolute_path (npath))
-    {
-      cmt_string h = pwd ();
-      h += file_separator ();
-      h += npath;
-      npath = h;
-    }
-
-  compress_path (npath);
-
-  //cerr << "adding npath=" << npath << endl;
-
-  while (npath[npath.size ()-1] == file_separator ())
-    {
-      npath.erase (npath.size ()-1);
-    }
-
-  //cerr << "adding npath=[" << npath << "]" << endl;
-
-  if (npath != "")
-    {
-      if (!test_directory (npath))
-        {
-          CmtError::set (CmtError::path_not_found, npath);
-          return;
-        }
-
-      factory.create_project (npath, path_source);
-    }
-}
+    if (npath.size () == 2)
+      {
+        if (npath[1] == ':')
+          {
+            npath += CmtSystem::file_separator ();
+          }
+      }
+#endif
+
+    npath.replace_all ("\\", CmtSystem::file_separator ());
+    npath.replace_all ("/", CmtSystem::file_separator ());
+
+    if (!CmtSystem::absolute_path (npath))
+      {
+        cmt_string h = CmtSystem::pwd ();
+        h += CmtSystem::file_separator ();
+        h += npath;
+        npath = h;
+      }
+    
+    CmtSystem::compress_path (npath);
+
+    //cerr << "adding npath=" << npath << endl;
+
+    while (npath[npath.size ()-1] == CmtSystem::file_separator ())
+      {
+        npath.erase (npath.size ()-1);
+      }
+    
+    //cerr << "adding npath=[" << npath << "]" << endl;
+    
+    if (npath != "")
+      {
+        if (!CmtSystem::test_directory (npath))
+          {
+            CmtError::set (CmtError::path_not_found, npath);
+            return;
+          }
+        
+        m_project = factory.create_project (npath, path_source, m_project);
+      }
+  }
+
+  Project* m_project;
+};
+
+CMTPathManager& CMTPathManager::instance ()
+{
+  static CMTPathManager me;
+  
+  return (me);
+}
+
+void CMTPathManager::reset ()
+{
+  static CMTPathManager& me = instance ();
+  me.do_reset ();
+}
+
+void CMTPathManager::add_cmt_path (const cmt_string& path,
+                                   const cmt_string& path_source,
+                                   IProjectFactory& factory)
+{
+  static CMTPathManager& me = instance ();
+  me.do_add_cmt_path (path, path_source, factory);
+}
+
+
 
 //----------------------------------------------------------
@@ -1295 +1347 @@
       const cmt_string& path = path_vector[i];
 
-      CmtSystem::add_cmt_path (path, context, factory);
-    }
-}
-
-//----------------------------------------------------------
-static void add_cmt_paths (const cmt_string& file_name, IProjectFactory& factory)
+      CMTPathManager::add_cmt_path (path, context, factory);
+    }
+}
+
+//----------------------------------------------------------
+static void add_cmt_paths_from_file (const cmt_string& file_name, IProjectFactory& factory)
 {
   if (!CmtSystem::test_file (file_name)) return;
@@ -1324 +1376 @@
 
 //----------------------------------------------------------
-void CmtSystem::get_cmt_paths (IProjectFactory& factory, const cmt_string& init_text)
-{
+//
+// With this function we analyse all possible ways of
+// externally entering CMTPATH items
+//  + from the environment variable
+//  + from .cmtrc files
+//  + from registry on Windows
+//  + from EV settings for CMTUSERCONTEXT and CMTHOME
+// 
+// Then projects are created from these settings.
+//
+// (The other way to enter project graph is through project files)
+//----------------------------------------------------------
+void CmtSystem::get_cmt_paths (IProjectFactory& factory, 
+                               const cmt_string& init_text,
+                               const cmt_string& cmt_user_context,
+                               const cmt_string& cmt_home)
+{
+  CMTPathManager::reset ();
+
   if (init_text != "")
     {
@@ -1355 +1424 @@
             {
               const cmt_string path = temp;
-              add_cmt_path (path, "HKEY_CURRENT_USER", factory);
+              CMTPathManager::add_cmt_path (path, "HKEY_CURRENT_USER", factory);
             }
 
@@ -1388 +1457 @@
             {
               const cmt_string path = temp;
-              add_cmt_path (path, "HKEY_LOCAL_MACHINE", factory);
+              CMTPathManager::add_cmt_path (path, "HKEY_LOCAL_MACHINE", factory);
             }
           else
@@ -1421 +1490 @@
           const cmt_string& path = path_vector[i];
 
-          add_cmt_path (path, "${CMTPATH}", factory);
-        }
-    }
-
-  add_cmt_paths (".cmtrc", factory);
+          CMTPathManager::add_cmt_path (path, "${CMTPATH}", factory);
+        }
+    }
+
+  add_cmt_paths_from_file (".cmtrc", factory);
 
   if (get_home_directory (rc_name))
@@ -1431 +1500 @@
       rc_name += file_separator ();
       rc_name += ".cmtrc";
-      add_cmt_paths (rc_name, factory);
+      add_cmt_paths_from_file (rc_name, factory);
     }
 
@@ -1446 +1515 @@
   rc_name += ".cmtrc";
 
-  add_cmt_paths (rc_name, factory);
-
-  //add_cmt_path (get_cmt_root (), "default path", factory);
+  add_cmt_paths_from_file (rc_name, factory);
+
+  // Suppress the definition of a CMTPATH entry for CMT itself
+  //CMTPathManager::add_cmt_path (get_cmt_root (), "default path", factory);
+
+  CMTPathManager::add_cmt_path (cmt_user_context, "CMTUSERCONTEXT", factory);
+  CMTPathManager::add_cmt_path (cmt_home, "CMTHOME", factory);
 }
 

CMT/v1r19/source/cmt_system.h

@@ -13 +13 @@
 #include "cmt_regexp.h"
 
+class Project;
+
 class IProjectFactory
 {
 public:
   virtual void reset () = 0;
-  virtual void create_project (const cmt_string& path,
-                               const cmt_string& path_source) = 0;
+  virtual Project* create_project (const cmt_string& path,
+                                   const cmt_string& path_source,
+                                   Project* parent) = 0;
 };
 
@@ -107 +110 @@
   static cmt_string getenv (const cmt_string& name);
   static bool putenv (const cmt_string& name_value);
-  static void add_cmt_path (const cmt_string& path,
-                            const cmt_string& path_source,
-                            IProjectFactory& factory);
   static void get_cmt_paths (IProjectFactory& factory,
-                             const cmt_string& init_text = "");
+                             const cmt_string& init_text,
+                             const cmt_string& cmt_user_context,
+                             const cmt_string& cmt_home);
   static int execute (const cmt_string& command);
   static int execute (const cmt_string& command, cmt_string& output);