Changeset 10

Timestamp:

Mar 10, 2005, 11:20:10 AM (19 years ago)

Author:

arnault

Message:

Work on projects

File:

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

CMT/v1r19/source/cmt_project.cxx

@@ -390 +390 @@
         p.set_name (name);
         p.set_release (release);
+        p.configure ();
 
         return (&p);
@@ -400 +401 @@
   project.set_name (name);
   project.set_release (release);
+  project.configure ();
 
   return (&project);
@@ -450 +452 @@
   Project* current = get_current ();
 
-  current->show ();
-  
-
+  if (current != 0) current->show ();
 }
 
@@ -803 +803 @@
 {
   m_name = name;
-  //configure ();
 }
 
@@ -894 +893 @@
 
   m_parents.push_back (p);
+
+  // Since p is a new parent, we should propagate the settings UP.
+
+  if (m_setup_strategy_mask != 0)
+    {
+      p->set_setup_strategy (m_setup_strategy_mask, m_setup_strategy & PrototypesMask);
+      p->set_setup_strategy (m_setup_strategy_mask, m_setup_strategy & InstallAreaMask);
+    }
+
+  if (m_build_strategy_mask != 0)
+    {
+      p->set_build_strategy (m_build_strategy_mask, m_build_strategy & SetupConfigMask);
+      p->set_build_strategy (m_build_strategy_mask, m_build_strategy & SetupRootMask);
+      p->set_build_strategy (m_build_strategy_mask, m_build_strategy & SetupCleanupMask);
+    }
 }
 
@@ -1167 +1181 @@
   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 ();
+
+  int i;
+
+  bool request_non_default_prototypes = false;
+  bool request_non_default_installarea = false;
+
+  int m_prototypes = 0;
+  int m_installarea = 0;
+
+  for (i = 0; i < m_children.size (); i++)
+    {
+      const Project* p = m_children[i];
+      int s = p->get_build_strategy ();
+
+      int s_prototypes = s & ~PrototypesMask;
+
+      if (s_prototypes != DefaultPrototypesStrategy)
+        {
+          // keep it. At least one of the children has specified a non-default strategy
+          request_non_default_prototypes = true;
+          m_prototypes = s_prototypes;
+        }
+
+      int s_installarea = s & ~InstallAreaMask;
+
+      if (s_installarea != DefaultInstallAreaStrategy)
+        {
+          // keep it. At least one of the children has specified a non-default strategy
+          request_non_default_installarea = true;
+          m_installarea = s_installarea;
+        }
+    }
 
   if (m_build_strategy_mask != 0)
@@ -1179 +1219 @@
       result &= ~m_build_strategy_mask;
       result |= m_build_strategy;
+    }
+  else
+    {
+      if (request_non_default_prototypes)
+        {
+          result |= m_prototypes;
+        }
+
+      if (request_non_default_installarea)
+        {
+          result |= m_installarea;
+        }
     }
 
@@ -1251 +1303 @@
       to_tag->mark ();
     }
-
-  
-  /*
-  static ProjectVector& Projects = projects ();
-
-  for (int i = 0; i < Projects.size (); i++)
-    {
-      Project& project = Projects[i];
-
-      if ((project.m_predecessor == this) ||
-          (project.m_reference == this))
-        {
-          if ((project.m_build_strategy_mask & mask) == 0)
-            {
-              project.set_build_strategy (mask, strategy);
-            }
-        }
-    }
-      */
-
+  
+  for (int i = 0; i < m_parents.size (); i++)
+    {
+      Project* project = m_parents[i];
+
+      if ((project->m_build_strategy_mask & mask) == 0)
+        {
+          project->set_build_strategy (mask, strategy);
+        }
+    }
 }
 
@@ -1326 +1368 @@
       to_tag->mark ();
     }
-
-  /*
-  static ProjectVector& Projects = projects ();
-
-  for (int i = 0; i < Projects.size (); i++)
-    {
-      Project& project = Projects[i];
-
-      if ((project.m_predecessor == this) ||
-          (project.m_reference == this))
-        {
-          if ((project.m_setup_strategy_mask & mask) == 0)
-            {
-              project.set_setup_strategy (mask, strategy);
-            }
-        }
-    }
-  */
-}
-
+  
+  for (int i = 0; i < m_parents.size (); i++)
+    {
+      Project* project = m_parents[i];
+
+      if ((project->m_setup_strategy_mask & mask) == 0)
+        {
+          project->set_setup_strategy (mask, strategy);
+        }
+    }
+}
+