Changeset 526 for CMT/HEAD/source

Timestamp:

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

Author:

rybkin

Message:

See C.L. 413

Location:

CMT/HEAD/source

Files:

• cmt_project.cxx (modified) (1 diff)
• cmt_project.h (modified) (1 diff)
• cmt_syntax.cxx (modified) (1 diff)

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