Changeset 526 for CMT

Timestamp:

Nov 13, 2009, 11:56:56 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 413

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-11-13    <rybkin@lal.in2p3.fr> 413
+
+        * source/cmt_project.h: In class Project, restore function get_container
+        returning (reference to) container object
+        * source/cmt_project.cxx: Implement the modified function
+        * source/cmt_syntax.cxx: In function SyntaxParser::parse_requirements,
+        apply tag container_package if the current package is the container package
+        of the project
+        
 2009-11-06    <rybkin@lal.in2p3.fr> 412
 

CMT/HEAD/source/cmt_project.cxx

@@ -1800 +1800 @@
 
 //----------------------------------------------------------
+const Use& Project::get_container () const
+{
+  return (m_container);
+}
+
+//----------------------------------------------------------
 const cmt_string& Project::get_cmtpath () const
 {

CMT/HEAD/source/cmt_project.h

@@ -140 +140 @@
   const cmt_string& get_container_version () const;
   const cmt_string& get_container_path () const;
-  //  const Use& get_container () const;
+  const Use& get_container () const;
   const cmt_string& get_cmtpath () const;
   const cmt_string& get_cmtpath_real () const;

CMT/HEAD/source/cmt_syntax.cxx

@@ -1464 +1464 @@
               
             }
+          // Apply tag container_package if
+          // the current package is the container package of the project
+          if (use == &(Use::current ()) &&
+              use->get_package_name() == p->get_container ().get_package_name () &&
+              use->version == p->get_container ().version)
+            {
+              cmt_string name ("container_package");
+              cmt_string context ("PROJECT " + p->get_name () + " ");
+              Tag* tag = Tag::find (name);
+              if (tag == 0)
+                {
+                  tag = Tag::add (name, PriorityUserTag, context, use);
+                }
+              tag->mark ();
+            }
         }                 
       use->close_scope_sections ();