Changeset 8 for CMT/v1r19/source/cmt_project.cxx

Timestamp:

Mar 3, 2005, 5:23:09 PM (19 years ago)

Author:

arnault

Message:

Add release conflict detection - CL 255

File:

• CMT/v1r19/source/cmt_project.cxx (modified) (12 diffs)

CMT/v1r19/source/cmt_project.cxx

@@ -16 +16 @@
 #include "cmt_syntax.h"
 #include "cmt_tag.h"
+#include "cmt_error.h"
 
 class ProjectReader : public Awk
@@ -128 +129 @@
   if (!CmtSystem::cd (compressed_path)) return;
 
+  cmt_string name;
+  cmt_string release;
+  CmtSystem::basename (compressed_path, release);
+
   //
   // Figure out if this is the current project
@@ -149 +154 @@
       reader.run (text);
 
-      cmt_string name = reader.get_project_name ();
+      name = reader.get_project_name ();
       if (name == "")
         {
+          CmtSystem::dirname (compressed_path, name);
+          CmtSystem::basename (name, name);
+
+          /*
           char buffer[20];
           m_id++;
           sprintf (buffer, "Project%d", m_id);
           name = buffer;
-        }
-
-      project = Project::add (name);
-
+          */
+        }
     }
   else
@@ -167 +174 @@
         {
           strcpy (buffer, "CMT");
+          name = buffer;
         }
       else
         {
-          m_id++;
-          sprintf (buffer, "Project%d", m_id);
-        }
-      project = Project::add (buffer);
-    }
+          CmtSystem::dirname (compressed_path, name);
+          CmtSystem::basename (name, name);
+          //m_id++;
+          //sprintf (buffer, "Project%d", m_id);
+        }
+    }
+
+  project = Project::add (name, release);
 
   if (source == "default path")
@@ -337 +348 @@
 
 //----------------------------------------------------------
-Project* Project::add (const cmt_string& name)
+Project* Project::add (const cmt_string& name,
+                       const cmt_string& release)
 {
   static ProjectVector& Projects = projects ();
@@ -349 +361 @@
     if (project != 0) 
       {
+        if (!Cmt::get_quiet ())
+          {
+            if (release != project->get_release ())
+              {
+                cerr << "#CMT> Project " << name << " requested with conflicting releases " << project->get_release () << " and " << release << endl;
+                CmtError::set (CmtError::project_release_conflict, name);
+              }
+          }
+
+        // Project objects are recreated here to follow the hierarchy
+        // This duplication is needed for properly applying the strategies
         Project& p = Projects.add ();
 
         project->set_reference (&p);
         p.set_name (name);
+        p.set_release (release);
 
         return (&p);
+
+        //return (project);
       }
   }
@@ -360 +386 @@
   Project& project = Projects.add ();
   project.set_name (name);
+  project.set_release (release);
 
   return (&project);
@@ -613 +640 @@
 
 //----------------------------------------------------------
+const cmt_string& Project::get_release () const
+{
+  return (m_release);
+}
+
+//----------------------------------------------------------
 const cmt_string& Project::get_cmtpath () const
 {
@@ -638 +671 @@
 
 //----------------------------------------------------------
+void Project::set_release (const cmt_string& release)
+{
+  m_release = release;
+}
+
+//----------------------------------------------------------
 void Project::set_cmtpath (const cmt_string& path)
 {
@@ -671 +710 @@
 {
   m_name = "";
+  m_release = "";
   m_cmtpath = "";
   m_cmtpath_pwd = "";
@@ -814 +854 @@
   //   +             the new project is then parsed ... etc...
 
-  // Question : do we consider by default pwd/../.. ???
-
   cmt_string cmtprojectpath = CmtSystem::getenv ("CMTPROJECTPATH");
   cmt_string sep;
@@ -884 +922 @@
     }
 
-  cout << m_name << " (in " << m_cmtpath << ")";
+  cout << m_name << " " << m_release << " (in " << m_cmtpath << ")";
 
   if (is_current) cout << " (current)";