Changeset 525 for CMT/HEAD/source/cmt_project.cxx

Timestamp:

Nov 6, 2009, 12:02:54 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 412

File:

• CMT/HEAD/source/cmt_project.cxx (modified) (6 diffs)

CMT/HEAD/source/cmt_project.cxx

@@ -1120 +1120 @@
 
 /*----------------------------------------------------------*/
+void Project::show_container ()
+{
+  Project* p = get_current ();
+
+  if (p == 0) return;
+  Use* use = &(p->m_container);
+  if (use->get_package_name () == "") return;
+
+          if (!use->located ())
+            {
+              CmtMessage::warning ("container " + use->get_package_name ()
+                                   + " " + use->version + " " + use->path
+                                   + " not found");
+              /*
+              if (!Cmt::get_quiet ())
+                {
+                  cout << "# package " << use->get_package_name () <<
+                    " " << use->version << " " << use->path << 
+                    " not found" <<
+                    endl;
+                }
+              */
+              CmtError::set (CmtError::package_not_found, use->get_package_name ());
+            }
+          else
+            {
+              static const cmt_string empty;
+              cmt_string p = use->real_path;
+              if (use->path != "")
+                {
+                  int pos = p.find_last_of (use->path);
+                  if (pos != cmt_string::npos)
+                    {
+                      p.erase (pos);
+                    }
+                }
+              
+              cout << "container " << use->get_package_name ()
+                   << " " << use->version;
+
+              if (CmtSystem::absolute_path (use->path))
+                {
+                  if (!Cmt::get_quiet ()) 
+                    {
+                      cout << " (" << use->path << ")";
+                    }
+                }
+              else
+                {
+                  cout << " " << use->path;
+                }
+
+              if (!Cmt::get_quiet ()) 
+                {
+                  if (p != "") cout << " (" << p << ")";
+                  if (use->auto_imports == Off) cout << " (no_auto_imports)";
+                }
+
+              cout << endl;
+            }
+}
+/*----------------------------------------------------------*/
 void Project::show_specified_strategies_for_all ()
 {
@@ -1720 +1782 @@
 
 //----------------------------------------------------------
-const cmt_string& Project::get_container () const
-{
-  return (m_container);
+const cmt_string& Project::get_container_name () const
+{
+  return (m_container_name);
 }
 
@@ -1729 +1791 @@
 {
   return (m_container_version);
+}
+
+//----------------------------------------------------------
+const cmt_string& Project::get_container_path () const
+{
+  return (m_container_path);
 }
 
@@ -1788 +1856 @@
 
 //----------------------------------------------------------
-void Project::set_container (const cmt_string& container)
-{
-  m_container = container;
+void Project::set_container_name (const cmt_string& name)
+{
+  m_container_name = name;
 }
 
@@ -1797 +1865 @@
 {
   m_container_version = container_version;
+}
+
+//----------------------------------------------------------
+void Project::set_container_path (const cmt_string& container_path)
+{
+  m_container_path = container_path;
 }
 
@@ -1954 +2028 @@
    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);
+void Project::container_action (const CmtSystem::cmt_string_vector& words)
+//void Project::container_action (const cmt_string& name, const cmt_string& version)
+{
+  //
+  // complete syntax : "container <package> <version> <path>"  
+  // minimal syntax  : "container <package>"
+  //
+  //  o if <version> is omitted then take any version available
+  //  o <version> can be specified using "v*" or "v<n>r*" or "v<n>r<m>p*"
+  //
+  //  o the notation "v*" is preferred to omission (particularly since
+  //    omission does not permit <path>)
+  //
+  Use* use = &m_container;
+  use->~Use ();
+  if (words.size () < 2) return;
+
+  CmtSystem::cmt_string_vector ewords;
+  for (int i = 1; i < words.size (); i++)
+    {
+      const cmt_string& w = words[i];
+      cmt_string ew = w;
+
+      Symbol::expand (ew);
+      if (ew != w)
+        {
+          CmtSystem::cmt_string_vector ws;
+          CmtSystem::split (ew, " ", ws);
+
+          for (int j = 0; j < ws.size (); ++j)
+            {
+              ewords.push_back (ws[j]);
+            }
+        }
+      else
+        {
+          ewords.push_back (w);
+        }
+    }
+
+  cmt_string name, version, path;
+  if (ewords.size () > 0) name = ewords[0];
+  if (ewords.size () > 1) version = ewords[1];
+  if (ewords.size () > 2) path = ewords[2];
+
+  if (name != "")
+    {
+      use->set (name, version, path);
+      use->get_package ()->remove_use (use);
+      if (use->move_to ())
+        {
+          cmt_string use_real;
+          bool ok (false);
+          if (!CmtSystem::absolute_path (use->path))
+            {
+              ok = CmtSystem::realpath_ (use->real_path, use_real);
+            }
+          else
+            {
+              ok = CmtSystem::realpath_ (use->path, use_real);
+            }
+          if (ok && use_real.find (m_cmtpath_real) != 0)
+            {
+              use->~Use ();
+            }
+        }
+      CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt");
+    }
+  //  cerr << CmtSystem::pwd () << endl;
+
+  set_container_name (name);
   set_container_version (version);
+  set_container_path (path);
 }