Changeset 8 for CMT

Timestamp:

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

Author:

arnault

Message:

Add release conflict detection - CL 255

Location:

CMT/v1r19

Files:

• CVS/Entries (modified) (1 diff)
• CVS/Entries.Log (deleted)
• ChangeLog (modified) (1 diff)
• contrib/CVS/Entries (modified) (1 diff)
• contrib/CVS/Entries.Log (deleted)
• doc/CVS/Entries (modified) (1 diff)
• doc/CVS/Entries.Log (deleted)
• mgr/CVS/Entries (modified) (1 diff)
• source/CVS/Entries (modified) (5 diffs)
• source/cmt_error.cxx (modified) (1 diff)
• source/cmt_error.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_project.cxx (modified) (12 diffs)
• source/cmt_project.h (modified) (3 diffs)
• src/CVS/Entries (modified) (1 diff)
• src/CVS/Entries.Log (deleted)
• src/demo/CVS/Entries (modified) (1 diff)
• src/demo/CVS/Entries.Log (deleted)
• src/demo/demoA/CVS/Entries (modified) (1 diff)
• src/demo/demoA/CVS/Entries.Log (deleted)
• src/demo/demoA/fragments/CVS/Entries (modified) (1 diff)
• src/demo/demoA/fragments/CVS/Entries.Log (deleted)

CMT/v1r19/CVS/Entries

@@ -1 @@
-/ChangeLog/1.330/Mon Feb 14 13:12:44 2005//
-D
+D/Visual////
+D/contrib////
+D/demo////
+D/doc////
+D/fragments////
+D/grafviz////
+D/java////
+D/mgr////
+D/source////
+D/src////
+/ChangeLog/1.331/Thu Mar  3 10:24:59 2005//

CMT/v1r19/ChangeLog

@@ +1 @@
+2005-03-03  Christian Arnault  <arnault@lal.in2p3.fr> 255
+
+        * source/cmt_project.cxx (add): Manage project release conflicts.
+
+        * source/cmt_error.h (class CmtError): Add project_release_conflict error
+        * source/cmt_error.cxx (class Error): Add project_release_conflict error
+
+        * source/cmt_project.h (class Project): Introduce the management of release information in projects
+
+        * source/cmt_parser.cxx (do_check_configuration): Finally suppress the checking of CMTCONFIG 
+        (do_setup): Add do_check_configuration to check some tag settings.
+
 2005-03-02  Christian Arnault  <arnault@lal.in2p3.fr> 254
 

CMT/v1r19/contrib/CVS/Entries

@@ -4 +4 @@
 /scenario2.sh/1.1/Wed Sep 13 08:43:59 2000//
 /scenario4.py/1.1/Thu Jan 18 14:45:16 2001//
-D
+D/cvsmove////

CMT/v1r19/doc/CVS/Entries

@@ -32 +32 @@
 /tbroadcast.html/1.2/Wed Aug 25 09:04:28 2004//
 /todo.html/1.4/Wed Aug 25 09:04:28 2004//
-D
+D/Images////

CMT/v1r19/mgr/CVS/Entries

@@ -59 +59 @@
 /srt2cmt.sh/1.5/Mon Dec  4 16:04:23 2000//
 /tag.nmake/1.25/Wed Apr 10 15:48:30 2002//
-D
+D/fragments////

CMT/v1r19/source/CVS/Entries

@@ -7 +7 @@
 /cmt_cmtpath_pattern.cxx/1.1/Thu Sep 30 16:21:12 2004//
 /cmt_cmtpath_pattern.h/1.1/Thu Sep 30 16:21:12 2004//
-/cmt_commands.cxx/1.5/Mon Feb  7 10:35:03 2005//
 /cmt_commands.h/1.1/Sun Oct 24 23:00:36 2004//
 /cmt_constituent.cxx/1.3/Tue Dec 14 14:17:25 2004//
@@ -17 +16 @@
 /cmt_deps_builder.cxx/1.1/Thu Sep 30 16:21:12 2004//
 /cmt_deps_builder.h/1.1/Thu Sep 30 16:21:12 2004//
-/cmt_error.cxx/1.1/Thu Sep 30 16:21:12 2004//
-/cmt_error.h/1.1/Thu Sep 30 16:21:13 2004//
 /cmt_fragment.cxx/1.1/Thu Sep 30 16:21:13 2004//
 /cmt_fragment.h/1.1/Thu Sep 30 16:21:13 2004//
@@ -44 +41 @@
 /cmt_model.cxx/1.1/Thu Sep 30 16:21:14 2004//
 /cmt_model.h/1.1/Thu Sep 30 16:21:14 2004//
-/cmt_parser.cxx/1.10/Tue Dec 14 14:17:25 2004//
 /cmt_parser.h/1.3/Wed Dec  1 11:26:52 2004//
 /cmt_pattern.cxx/1.1/Thu Sep 30 16:21:14 2004//
 /cmt_pattern.h/1.1/Thu Sep 30 16:21:14 2004//
-/cmt_project.cxx/1.3/Wed Dec  1 11:26:52 2004//
-/cmt_project.h/1.2/Wed Dec  1 11:26:52 2004//
 /cmt_regexp.cxx/1.1/Thu Sep 30 16:21:15 2004//
 /cmt_regexp.h/1.1/Thu Sep 30 16:21:15 2004//
@@ -61 +55 @@
 /cmt_string.cxx/1.1/Thu Sep 30 16:21:15 2004//
 /cmt_string.h/1.1/Thu Sep 30 16:21:15 2004//
-/cmt_symbol.cxx/1.2/Sun Oct 24 23:00:36 2004//
-/cmt_symbol.h/1.1/Thu Sep 30 16:21:15 2004//
-/cmt_syntax.cxx/1.3/Wed Dec  1 11:26:52 2004//
 /cmt_syntax.h/1.2/Sun Oct 24 23:00:36 2004//
-/cmt_system.cxx/1.4/Mon Feb  7 10:39:05 2005//
 /cmt_system.h/1.1/Thu Sep 30 16:21:16 2004//
-/cmt_tag.cxx/1.2/Tue Nov  2 02:17:57 2004//
-/cmt_tag.h/1.1/Thu Sep 30 16:21:17 2004//
 /cmt_triggers.cxx/1.1/Thu Sep 30 16:21:17 2004//
 /cmt_triggers.h/1.1/Thu Sep 30 16:21:17 2004//
@@ -75 +63 @@
 /cmt_vector.h/1.1/Thu Sep 30 16:21:17 2004//
 /cmt_vector_iterator.h/1.1/Thu Sep 30 16:21:17 2004//
-/cmt_version.h/1.3/Wed Dec  1 11:26:52 2004//
 /install.cxx/1.1/Thu Sep 30 16:21:17 2004//
 /install_resource.h/1.1/Thu Sep 30 16:21:17 2004//
 /install_utils.cxx/1.1/Thu Sep 30 16:21:18 2004//
 /install_utils.h/1.1/Thu Sep 30 16:21:18 2004//
+/cmt_commands.cxx/1.6/Wed Mar  2 09:45:29 2005//
+/cmt_error.cxx/1.2/Wed Mar  2 09:43:11 2005//
+/cmt_error.h/1.2/Wed Mar  2 09:42:17 2005//
+/cmt_parser.cxx/1.11/Wed Mar  2 15:23:24 2005//
+/cmt_project.cxx/1.4/Wed Mar  2 14:00:36 2005//
+/cmt_project.h/1.3/Wed Mar  2 13:47:55 2005//
+/cmt_symbol.cxx/1.3/Wed Mar  2 16:33:53 2005//
+/cmt_symbol.h/1.2/Wed Mar  2 16:31:44 2005//
+/cmt_syntax.cxx/1.4/Tue Mar  1 11:15:50 2005//
+/cmt_system.cxx/1.5/Tue Feb 15 16:23:24 2005//
+/cmt_tag.cxx/1.3/Tue Mar  1 17:18:54 2005//
+/cmt_tag.h/1.2/Tue Mar  1 16:52:15 2005//
+/cmt_version.h/1.4/Tue Mar  1 08:42:29 2005//
 D

CMT/v1r19/source/cmt_error.cxx

@@ -34 +34 @@
     error_names.add() = "conflicting_lock";
     error_names.add() = "unknown_command";
+    error_names.add() = "project_release_conflict";
   }
 

CMT/v1r19/source/cmt_error.h

@@ -35 +35 @@
     cannot_remove_lock,
     conflicting_lock,
-    unknown_command
+    unknown_command,
+    project_release_conflict
   } code;
 

CMT/v1r19/source/cmt_parser.cxx

@@ -1997 +1997 @@
       cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl;
     }
-
-  env = CmtSystem::getenv ("CMTCONFIG");
-  if (env == "")
-    {
-      return;
-    }
-
-  tag = Tag::find (env);
-  if (tag == 0) 
-    {
-      return;
-    }
-
-  if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 
-    {
-      cerr << "#CMT> The CMTCONFIG value " << env << " is not used in any tag expression. Please check spelling" << endl;
-    }
 }
 
@@ -3959 +3942 @@
   //cerr << "buffer = " << buffer << endl;
   Use& use = Use::current();
+  bool save_quiet = Me.m_quiet;
+  Me.m_quiet = true;
   SyntaxParser::parse_requirements_text (buffer, "", &use);
+  Me.m_quiet = save_quiet;
 }
 

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)";

CMT/v1r19/source/cmt_project.h

@@ -47 +47 @@
   static Project* find_by_cmtpath (const cmt_string& cmtpath);
   static Project* get_current ();
-  static Project* add (const cmt_string& name);
+  static Project* add (const cmt_string& name,
+                       const cmt_string& release);
 
   static ProjectVector& projects ();
@@ -71 +72 @@
 
   const cmt_string& get_name () const;
+  const cmt_string& get_release () const;
   const cmt_string& get_cmtpath () const;
   const cmt_string& get_cmtpath_pwd () const;
   const cmt_string& get_cmtpath_source () const;
-  void set_name (const cmt_string& new_name);
+  void set_name (const cmt_string& name);
+  void set_release (const cmt_string& release);
   void set_cmtpath (const cmt_string& path);
   void set_cmtpath_pwd (const cmt_string& path);
@@ -98 +101 @@
 private:
   cmt_string m_name;
+  cmt_string m_release;
 
   Project* m_reference;

CMT/v1r19/src/CVS/Entries

@@ -16 +16 @@
 /setup.tcsh/1.18/Tue Aug 31 14:43:20 2004//
 /setup.zsh/1.25/Wed Aug 25 09:04:34 2004//
-D
+D/demo////

CMT/v1r19/src/demo/CVS/Entries

@@ -4 +4 @@
 /tprivate.out/1.2/Fri Jun 21 14:47:36 2002//
 /tproject.cmt/1.2/Wed Aug 25 09:04:34 2004//
-D
+D/demoA////
+D/demoB////
+D/demoC////

CMT/v1r19/src/demo/demoA/CVS/Entries

@@ -6 +6 @@
 /init.sh/1.2/Wed Aug 25 09:04:34 2004//
 /requirements/1.11/Wed Aug 25 09:04:34 2004//
-D
+D/fragments////

CMT/v1r19/src/demo/demoA/fragments/CVS/Entries

@@ -1 +1 @@
 /rename/1.3/Wed Aug 25 09:04:35 2004//
 /rename_header/1.3/Wed Aug 25 09:04:35 2004//
-D
+D/nmake////