Changeset 38 for CMT

Timestamp:

Apr 14, 2005, 12:02:59 PM (19 years ago)

Author:

arnault

Message:

Fix project naming scheme. See CL 267

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-14  Christian Arnault  <arnault@lal.in2p3.fr> 267
+
+        * source/cmt_system.cxx (class CMTPathManager): CMTUSERCONTEXT and
+        CMTHOME environments give a specific name to teh associated
+        project.
+
+        * source/cmt_project.cxx (create_project): Fixing the project
+        naming scheme. Project name specified in the project files take
+        precedence over the names found in the path.
+
 2005-04-13  Christian Arnault  <arnault@lal.in2p3.fr> 266
 

CMT/HEAD/source/cmt_project.cxx

@@ -341 +341 @@
             {
               // The specified name is not in the path.
-              
+              /*
               if (!Cmt::get_quiet ())
                 {
@@ -348 +348 @@
                        << " from the caller does not match path." << endl;
                 }
+              */
+              name = specified_name;
             }
           
@@ -365 +367 @@
             {
               // The specified name is not in the path.
-              
+              /*
               if (!Cmt::get_quiet ())
                 {
@@ -372 +374 @@
                        << " from project file and from caller does not match path." << endl;
                 }
+              */
+              name = specified_name;
             }
           
@@ -410 +414 @@
                        << " from project file match path." << endl;
                 }
+
+              name = specified_name;
             }
           
@@ -422 +428 @@
               // The specified name has been found from the path.
               // We believe in the release spec.
-              
+
             }
           else
@@ -436 +442 @@
                 }
               */
+
+              name = project_name;
             }
           
@@ -473 +481 @@
             {
               // The specified name is not in the path.
-              
+              /*
               if (!Cmt::get_quiet ())
                 {
@@ -480 +488 @@
                        << " from project graph does not match path." << endl;
                 }
+              */
+              name = specified_name;
             }
           
@@ -1409 +1419 @@
   int i;
 
+  /*
   for (i = 0; i < m_parents.size (); i++)
     {
@@ -1422 +1433 @@
       cout << " C=" << p->get_name ();
     }
+  */
 
   cout << endl;

CMT/HEAD/source/cmt_system.cxx

@@ -1302 +1302 @@
             return;
           }
-        
-        m_project = factory.create_project ("", npath, path_source, m_project);
+
+        cmt_string project_name;
+
+        if ((path_source == "CMTUSERCONTEXT") ||
+            (path_source == "CMTHOME"))
+          {
+            project_name = path_source;
+          }
+
+        m_project = factory.create_project (project_name, npath, path_source, m_project);
       }
   }