Changeset 36

Timestamp:

Apr 13, 2005, 11:41:50 AM (19 years ago)

Author:

arnault

Message:

Fix bug in project hierarchy. See CL 265

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-12  Christian Arnault  <arnault@lal.in2p3.fr> 265
+
+        * source/cmt_project.cxx (create_project): Restructure the
+        algorithm for detection of roject structuring cases. Construct a
+        finite list of cases.
+        (has_parent): Implement recursive query function
+        (has_child): Implement recursive query function
+        (add_parent, add_child): Use the recursive detection to avoid cycles.
+
+        * source/cmt_project.h (class Project): Add has_parent and
+        has_child functions to protect against recursive cycles
+
 2005-04-02  Christian Arnault  <arnault@lal.in2p3.fr> 264
 

CMT/HEAD/source/cmt_project.cxx

@@ -95 +95 @@
 }
 
-static bool get_release_from_path (const cmt_string& path, const cmt_string& name, cmt_string& release)
+static bool get_release_from_path (const CmtSystem::cmt_string_vector& items, 
+                                   const cmt_string& path, 
+                                   const cmt_string& name, 
+                                   cmt_string& real_name, 
+                                   cmt_string& release)
 {
   bool result = false;
 
   release = "";
+  real_name = "";
 
   cmt_string p = path;
 
+  if ((items.size () == 0) && (name == ""))
+    {
+      // There is no CMTPROJECTPATH and no expected project name.
+      // We have no way to find a project structure
+      // So we only expect a 2-level structure.
+
+      CmtSystem::basename (p, release);
+      CmtSystem::dirname (p, p);
+      CmtSystem::basename (p, real_name);
+      
+      return (false);
+    }
+
   for (;;)
     {
+      if (p == "")
+        {
+          // Protection: we found no matching project name
+          // and path was outside any CMTPROJECTPATH
+
+          p = path;
+
+          CmtSystem::basename (p, release);
+          CmtSystem::dirname (p, p);
+          CmtSystem::basename (p, real_name);
+
+          return (false);
+        }
+
       cmt_string n;
 
@@ -112 +144 @@
       if (n == name)
         {
+          real_name = name;
           result = true;
           break;
+        }
+
+      CmtSystem::basename (p, real_name);
+
+      for (int i = 0; i < items.size (); i++)
+        {
+          const cmt_string& item = items[i];
+          if (p == item)
+            {
+              // We have reached an item of CMTPROJECTPATH, no need to continue
+              return (false);
+            }
         }
 
@@ -153 +198 @@
   bool specify_name = (specified_name != "");
 
-  //cerr << "Creating project " << path << " with parent " << ((parent==0)? "0" : parent->get_name ()) << endl;
+  if (Cmt::get_debug ())
+    {
+      cout << "Creating project " << path << " with parent " << ((parent==0)? "0" : parent->get_name ()) << endl;
+      Project::show_all ();
+    }
+
+  cmt_string sep;
+  sep = CmtSystem::path_separator ();
+
+  cmt_string cmtprojectpath = CmtSystem::getenv ("CMTPROJECTPATH");
+  CmtSystem::cmt_string_vector items;
+  CmtSystem::split (cmtprojectpath, sep, items);
 
   static Project::ProjectVector& Projects = Project::projects ();
@@ -166 +222 @@
         {
           cmt_string r;
-
-          get_release_from_path (compressed_path, p.get_name (), r);
+          cmt_string n;
+
+          get_release_from_path (items, compressed_path, p.get_name (), n, r);
 
           if (r != p.get_release ())
             {
-              cerr << "#CMT> Project " << p.get_name () << " requested with conflicting releases " << p.get_release () << " and " << r << endl;
+              cerr << "#CMT> Project " << p.get_name ()
+                   << " requested with conflicting releases " << p.get_release () << " and " << r << endl;
               CmtError::set (CmtError::project_release_conflict, p.get_name ());
             }
@@ -199 +257 @@
 
   cmt_string name = specified_name;
+  cmt_string project_name;
   cmt_string release;
 
@@ -213 +272 @@
        or does not specify the project name
    */
+  bool has_project_file = false;
+
   if (CmtSystem::cd ("cmt") && CmtSystem::test_file (Project::get_project_file_name ()))
     {
+      has_project_file = true;
       text.read (Project::get_project_file_name ());
 
@@ -221 +283 @@
       reader.run (text);
 
-      name = reader.get_project_name ();
-      if (name == "")
-        {
-          if (!specify_name)
-            {
-              // The project is neither specified from the caller nor from the project file
-              // Send a warning?
-              // How can we guess it?
-              // For the moment, assume /name/release/ structure where release is one level only
+      project_name = reader.get_project_name ();
+    }
+
+  enum
+    {
+      without_project_file   = 0x01,
+      with_project_file      = 0x02,
+      without_project_name   = 0x04,
+      with_project_name      = 0x08,
+      without_specified_name = 0x10,
+      with_specified_name    = 0x20,
+      names_mismatch         = 0x40,
+      names_match            = 0x80
+    };
+
+  int status = ((has_project_file) ? with_project_file : without_project_file) |
+    ((has_project_file && (project_name != "")) ? with_project_name : without_project_name) |
+    ((specify_name) ? with_specified_name : without_specified_name) |
+    ((specify_name && has_project_file && (project_name == specified_name)) ? names_match : names_mismatch);
+
+  if (source == "default path")
+    {
+      name = "CMT";
+    }
+  else
+    {
+      cmt_string n;
+          
+      switch (status)
+        {
+        case with_project_file | without_project_name | without_specified_name | names_mismatch:
+
+          // The project is neither specified from the caller nor from the project file
+
+          /*
+            if (!Cmt::get_quiet ())
+            {
+            cerr << "#CMT> Warning: project name unspecified in project file." << endl;
+            }
+          */
+      
+          get_release_from_path (items, compressed_path, "", name, release);
+
+          break;
+          
+        case with_project_file | without_project_name | with_specified_name | names_mismatch:
+          
+          // The name is only specified from the caller
+          // find this specified name in the path
+          
+          if (get_release_from_path (items, compressed_path, specified_name, name, release))
+            {
+              // The specified name has been found from the path.
+              // We believe in the release spec.
+            }
+          else
+            {
+              // The specified name is not in the path.
+              
+              if (!Cmt::get_quiet ())
+                {
+                  cerr << "#CMT> Warning: specified project name "
+                       << specified_name
+                       << " from the caller does not match path." << endl;
+                }
+            }
+          
+          break;
+          
+        case with_project_file | with_project_name | with_specified_name | names_match:
+          
+          // We have a double specification: from the caller and from the project file.
+          // And both specifications are consistent.  
+          
+          if (get_release_from_path (items, compressed_path, specified_name, name, release))
+            {
+              // The specified name has been found from the path.
+              // We believe in the release spec.
+            }
+          else
+            {
+              // The specified name is not in the path.
+              
+              if (!Cmt::get_quiet ())
+                {
+                  cerr << "#CMT> Warning: specified project name "
+                       << specified_name
+                       << " from project file and from caller does not match path." << endl;
+                }
+            }
+          
+          break;
+          
+        case with_project_file | with_project_name | with_specified_name | names_mismatch:
+          
+          // We have a double specification: from the caller and from the project file.
+          // Specifications are inconsistent!!
+          
+          if (!Cmt::get_quiet ())
+            {
+              cerr << "#CMT> Warning: specified project name "
+                   << specified_name
+                   << " inconsistent with name "
+                   << project_name
+                   << " from project file." << endl;
+            }
+          
+          if (get_release_from_path (items, compressed_path, specified_name, n, release))
+            {
+              // name from caller wins.
+            }
+          else if (get_release_from_path (items, compressed_path, project_name, name, release))
+            {
+              // name from project file wins.
+            }
+          else
+            {
+              // The specified name is not in the path.
+              
+              if (!Cmt::get_quiet ())
+                {
+                  cerr << "#CMT> Warning: none of specified project names "
+                       << specified_name
+                       << " from graph and "
+                       << project_name
+                       << " from project file match path." << endl;
+                }
+            }
+          
+          break;
+          
+        case with_project_file | with_project_name | without_specified_name | names_mismatch:
+          
+          // Project name is specified in the project file but not from the caller.
+          
+          if (get_release_from_path (items, compressed_path, project_name, name, release))
+            {
+              // The specified name has been found from the path.
+              // We believe in the release spec.
+              
+            }
+          else
+            {
+              // The specified name is not in the path.
 
               /*
               if (!Cmt::get_quiet ())
                 {
-                  cerr << "#CMT> Warning: project name unspecified in project file." << endl;
+                  cerr << "#CMT> Warning: specified project name "
+                       << project_name
+                       << " from project file does not match path." << endl;
                 }
               */
-
-              CmtSystem::basename (compressed_path, release);
-              CmtSystem::dirname (compressed_path, name);
-              CmtSystem::basename (name, name);
+            }
+          
+          break;
+          
+        case without_project_file | without_project_name | without_specified_name | names_mismatch:
+          
+          // The project is not specified from the caller and there is no project file
+          // This corresponds to the backward compatibility
+          // For the moment, assume /name/release/ structure where release is one level only
+          
+          /*
+            if (!Cmt::get_quiet ())
+            {
+            cerr << "#CMT> Warning: project name is not specified "
+            << " (no project file)." << endl;
+            }
+          */
+          
+          CmtSystem::basename (compressed_path, release);
+          CmtSystem::dirname (compressed_path, name);
+          CmtSystem::basename (name, name);
+          
+          break;
+          
+        case without_project_file | without_project_name | with_specified_name | names_mismatch:
+          
+          // The name is only specified from the caller
+          // find this specified name in the path
+          
+          if (get_release_from_path (items, compressed_path, specified_name, name, release))
+            {
+              // The specified name has been found from the path.
+              // We believe in the release spec.
             }
           else
             {
-              // The name is specified from the caller
-              // find this specified name in the path
-
-              cmt_string r;
-
-              if (get_release_from_path (compressed_path, specified_name, r))
-                {
-                  // The specified name has been found from the path.
-                  // We believe in the release spec.
-
-                  name = specified_name;
-                  release = r;
-                }
-              else
-                {
-                  // The specified name is not in the path.
-
-
-                  if (!Cmt::get_quiet ())
-                    {
-                      cerr << "#CMT> Warning: specified project name "
-                           << specified_name
-                           << " from project file does not match path." << endl;
-                    }
-
-                  CmtSystem::basename (compressed_path, release);
-                  CmtSystem::dirname (compressed_path, name);
-                  CmtSystem::basename (name, name);
-                }
-            }
-        }
-      else
-        {
-          if (specify_name)
-            {
-              // We have a double specification: from the caller and from the project file.
-              // check the consistency
-
-              if (name == specified_name)
-                {
-                  // Both specifications are consistent.  
-                  cmt_string r;
-
-                  if (get_release_from_path (compressed_path, specified_name, r))
-                    {
-                      // The specified name has been found from the path.
-                      // We believe in the release spec.
-
-                      name = specified_name;
-                      release = r;
-                    }
-                  else
-                    {
-                      // The specified name is not in the path.
-
-                      if (!Cmt::get_quiet ())
-                        {
-                          cerr << "#CMT> Warning: specified project name "
-                               << specified_name
-                               << " from project file does not match path." << endl;
-                        }
-
-                      CmtSystem::basename (compressed_path, release);
-                      CmtSystem::dirname (compressed_path, name);
-                      CmtSystem::basename (name, name);
-                    }
-                }
-              else
-                {
-                  // Specifications from the caller and from the project files are inconsistent!!
-
-                  if (!Cmt::get_quiet ())
-                    {
-                      cerr << "#CMT> Warning: specified project name "
-                           << specified_name
-                           << " inconsistent with name "
-                           << name
-                           << " from project file." << endl;
-                    }
-
-                  cmt_string r;
-
-                  if (get_release_from_path (compressed_path, specified_name, r))
-                    {
-                      // name from caller wins.
-                    }
-                  else if (get_release_from_path (compressed_path, specified_name, r))
-                    {
-                      // name from project file wins.
-                    }
-                  else
-                    {
-                      // The specified name is not in the path.
-
-                      if (!Cmt::get_quiet ())
-                        {
-                          cerr << "#CMT> Warning: none of specified project names "
-                               << name
-                               << " from graph and "
-                               << specified_name
-                               << " from project file match path." << endl;
-                        }
-
-                      CmtSystem::basename (compressed_path, release);
-                      CmtSystem::dirname (compressed_path, name);
-                      CmtSystem::basename (name, name);
-                    }
-                }
-            }
-        }
-    }
-  else
-    {
-      // There is no project file in this path.
-
-      if (source == "default path")
-        {
-          name = "CMT";
-        }
-      else
-        {
-          if (!specify_name)
-            {
-              // The project is not specified from the caller and there is no project file
-              // Send a warning?
-              // How can we guess it?
-              // For the moment, assume /name/release/ structure where release is one level only
-
-              /*
+              // The specified name is not in the path.
+              
               if (!Cmt::get_quiet ())
                 {
-                  cerr << "#CMT> Warning: project name is not specified "
-                       << " (no project file)." << endl;
+                  cerr << "#CMT> Warning: specified project name "
+                       << specified_name
+                       << " from project graph does not match path." << endl;
                 }
-              */
-
-              CmtSystem::basename (compressed_path, release);
-              CmtSystem::dirname (compressed_path, name);
-              CmtSystem::basename (name, name);
-            }
-          else
-            {
-              // The name is specified from the caller
-              // find this specified name in the path
-
-              cmt_string r;
-
-              if (get_release_from_path (compressed_path, specified_name, r))
-                {
-                  // The specified name has been found from the path.
-                  // We believe in the release spec.
-
-                  release = r;
-                }
-              else
-                {
-                  // The specified name is not in the path.
-
-                  if (!Cmt::get_quiet ())
-                    {
-                      cerr << "#CMT> Warning: specified project name "
-                           << specified_name
-                           << " from project graph does not match path." << endl;
-                    }
-
-                  CmtSystem::basename (compressed_path, release);
-                  CmtSystem::dirname (compressed_path, name);
-                  CmtSystem::basename (name, name);
-                }
-            }
+            }
+          
+          break;
         }
     }
 
   project = Project::add (name, release);
-
+      
   if (parent != 0)
     {
@@ -1122 +1191 @@
 
 //----------------------------------------------------------
+bool Project::has_parent (Project* p) const
+{
+  if (p == 0) return (false);
+  if (p == this) return (false);
+
+  const cmt_string& name = p->get_name ();
+
+  int i;
+
+  for (i = 0; i < m_parents.size (); i++)
+    {
+      const Project* parent = m_parents[i];
+      if (parent == 0) continue;
+
+      if (parent->get_name () == name)
+        {
+          // registered as a parent
+          return (true);
+        }
+
+      if (parent->has_parent (p))
+        {
+          // recurse
+          return (true);
+        }
+    }
+
+  return (false);
+}
+
+//----------------------------------------------------------
+bool Project::has_child (Project* p) const
+{
+  if (p == 0) return (false);
+  if (p == this) return (false);
+
+  const cmt_string& name = p->get_name ();
+
+  int i;
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      const Project* child = m_children[i];
+      if (child == 0) continue;
+
+      if (child->get_name () == name)
+        {
+          // registered as a child
+          return (true);
+        }
+
+      if (child->has_child (p))
+        {
+          // recurse
+          return (true);
+        }
+    }
+
+  return (false);
+}
+
+//----------------------------------------------------------
 void Project::add_parent (Project* p)
 {
@@ -1129 +1260 @@
   //cerr << "Adding parent " << p->get_name () << " to " << m_name << endl;
 
-  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 as a parent
-          return;
-        }
-    }
+  if (has_child (p)) return;
+  if (has_parent (p)) return;
 
   m_parents.push_back (p);
@@ -1164 +1272 @@
   if (p == this) 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 as a child
-          return;
-        }
-    }
+  if (has_child (p)) return;
+  if (has_parent (p)) return;
 
   m_children.push_back (p);
@@ -1324 +1409 @@
   int i;
 
-  /*
   for (i = 0; i < m_parents.size (); i++)
     {
@@ -1338 +1422 @@
       cout << " C=" << p->get_name ();
     }
-  */
 
   cout << endl;

CMT/HEAD/source/cmt_project.h

@@ -145 +145 @@
   void clear ();
   void configure ();
+  bool has_parent (Project* p) const;
+  bool has_child (Project* p) const;
   void add_parent (Project* p);
   void add_child (Project* p);