Changeset 41 for CMT

Timestamp:

Apr 23, 2005, 3:08:38 PM (19 years ago)

Author:

arnault

Message:

Implement the container statement in project file - See CL269 and #4

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (3 diffs)
• source/cmt_project.h (modified) (4 diffs)
• source/cmt_syntax.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-23  Christian Arnault  <arnault@lal.in2p3.fr> 269
+
+        * source/cmt_project.h (class Project): container and
+        container_version access methods
+
+        * source/cmt_project.cxx (container_action): Implementation of the
+        container statement
+
+        * source/cmt_project.h (class Project): Add handling of the container statement
+
+        * source/cmt_syntax.cxx (class KwdContainer): Add support of the
+        project container package
+        (SyntaxParser): idem
+
 2005-04-21  Christian Arnault  <arnault@lal.in2p3.fr> 268
 

CMT/HEAD/source/cmt_project.cxx

@@ -1117 +1117 @@
 
 //----------------------------------------------------------
+const cmt_string& Project::get_container () const
+{
+  return (m_container);
+}
+
+//----------------------------------------------------------
+const cmt_string& Project::get_container_version () const
+{
+  return (m_container_version);
+}
+
+//----------------------------------------------------------
 const cmt_string& Project::get_cmtpath () const
 {
@@ -1164 +1176 @@
 {
   m_release = release;
+}
+
+//----------------------------------------------------------
+void Project::set_container (const cmt_string& container)
+{
+  m_container = container;
+}
+
+//----------------------------------------------------------
+void Project::set_container_version (const cmt_string& container_version)
+{
+  m_container_version = container_version;
 }
 
@@ -1300 +1324 @@
   set_default_strategy ("BuildPrototypes");
   set_default_strategy ("InstallArea");
+}
+
+/**---------------------------------------------------------
+ A container statement is met in the project file
+*/
+void Project::container_action (const cmt_string& name, const cmt_string& version)
+{
+  //cerr << "Container action " << name << " " << version << endl;
+
+  set_container (name);
+  set_container_version (version);
 }
 

CMT/HEAD/source/cmt_project.h

@@ -131 +131 @@
   const cmt_string& get_name () const;
   const cmt_string& get_release () const;
+  const cmt_string& get_container () const;
+  const cmt_string& get_container_version () const;
   const cmt_string& get_cmtpath () const;
   const cmt_string& get_cmtpath_pwd () const;
@@ -140 +142 @@
   void set_name (const cmt_string& name);
   void set_release (const cmt_string& release);
+  void set_container (const cmt_string& container);
+  void set_container_version (const cmt_string& version);
   void set_cmtpath (const cmt_string& path);
   void set_cmtpath_pwd (const cmt_string& path);
@@ -150 +154 @@
   void add_child (Project* p);
 
+  void container_action (const cmt_string& name, const cmt_string& version);
   void use_action (const cmt_string& name, const cmt_string& release);
 
@@ -178 +183 @@
   cmt_string m_name;
   cmt_string m_release;
+  cmt_string m_container;
+  cmt_string m_container_version;
 
   ProjectPtrVector m_parents;

CMT/HEAD/source/cmt_syntax.cxx

@@ -234 +234 @@
   {
     CmtPathPattern::action (words, use);
+  }
+};
+
+class KwdContainer : public Kwd
+{
+public:
+  void action (const CmtSystem::cmt_string_vector& words,
+               Use* use,
+               const cmt_string& file_name,
+               int line_number)
+  {
+  }
+
+  void action (const CmtSystem::cmt_string_vector& words,
+               Project* project,
+               const cmt_string& file_name,
+               int line_number)
+  {
+    project->container_action (words[1], words[2]);
   }
 };
@@ -1065 +1084 @@
 
   m_project_keywords.add ("build_strategy", new KwdBuildStrategy ());
+  m_project_keywords.add ("container", new KwdContainer ());
   m_project_keywords.add ("project", new KwdProject ());
   m_project_keywords.add ("setup_strategy", new KwdSetupStrategy ());