Changeset 531 for CMT/HEAD/source/cmt_use.cxx

Timestamp:

Jan 8, 2010, 4:25:58 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 418

File:

• CMT/HEAD/source/cmt_use.cxx (modified) (22 diffs)

CMT/HEAD/source/cmt_use.cxx

@@ -133 +133 @@
   } CompareStatus;
 
-static CompareStatus compare_versions (const cmt_string& ref_version, const cmt_string& new_version)
+static CompareStatus compare_versions (const cmt_string& ref_version, const cmt_string& new_version, bool match = false)
 {
   CompareStatus result = IdenticalIds;
+
+  if (match)
+    {
+      if (ref_version == "" ||
+          ref_version == "*" ||
+          ref_version == "v*")
+        return IdenticalIds;
+
+      int wild_card = ref_version.find ('*');
+      if (wild_card != cmt_string::npos)
+        {
+          cmt_string ref_ver (ref_version.substr (0, wild_card));
+          if (ref_ver.size () > new_version.size ())
+            return IncompatibleMajorIds;
+          else if (strncmp (ref_ver.c_str (), new_version.c_str (), wild_card) == 0)
+            return IdenticalIds;
+          else
+            return IncompatibleMajorIds;
+        }
+      else if (ref_version == new_version)
+            return IdenticalIds;
+      else
+            return IncompatibleMajorIds;
+    }
 
   int old_v = -1;
@@ -664 +688 @@
 
         cout << "use::action1> current=" << parent->get_package_name () <<
-          " package=" << package << " ";
+          " package=" << package << "(" << version << ")" << " ";
 
         for (i = 0; i < uses.size (); i++)
@@ -1436 +1460 @@
   if (Cmt::get_debug ())
     {
-      cout << "Use::reach_package> (" << get_package_name () << " " 
-           << version << ")from " << from_path << endl;
+      cout << "Use::reach_package> " << get_package_name ()
+           << "(" << version << ") from " << from_path << endl;
       cout << "Use::reach_package> native_version required "<<n_version<<endl;
     }
@@ -1536 +1560 @@
   if (CmtSystem::test_file ("cmt/requirements"))
     {
-      CmtSystem::cd ("cmt");
-
-      style = no_version_style;
+      //      CmtSystem::cd ("cmt");
+
+      //      style = no_version_style;
 
       cmt_string v;
-      if (Package::get_version (v))
-        {
-          CompareStatus s = compare_versions (version, v);
+      //      if (Package::get_version (v))
+      if (Package::get_version (v, "cmt"))
+        {
+          CompareStatus s = compare_versions (version, v, true);
           if (Cmt::get_debug ())
             {
@@ -1574 +1599 @@
           version = "v0";
         }
+      CmtSystem::cd ("cmt");
+      style = cmt_style;
+      structuring_style = without_version_directory;
       return (1);
     }
@@ -1582 +1610 @@
       // There are alternate possibilities when it contains wild cards
       //
-      if ((version == "") || (version.find ("*") != cmt_string::npos))
+      //      if ((version == "") || (version.find ("*") != cmt_string::npos))
+      if (version.find ("*") != cmt_string::npos)
         {
           static CmtSystem::cmt_string_vector versions;
@@ -1589 +1618 @@
           name = ".";
           name += CmtSystem::file_separator ();
+          name += version;
+          /*
           if (version == "") name += "*";
           else name += version;
+          */
 
           CmtSystem::scan_dir (name, versions);
@@ -1691 +1723 @@
             }
 
+              /*
           if (!found)
             {
@@ -1700 +1733 @@
                 }
             }
+              */
         }
 
@@ -1733 +1767 @@
           CmtSystem::cd ("mgr");
           style = mgr_style;
+          structuring_style = with_version_directory;
         }
     }
@@ -1739 +1774 @@
       CmtSystem::cd ("cmt");
       style = cmt_style;
+      structuring_style = with_version_directory;
     }
 
@@ -2839 +2875 @@
   else s = real_path;
 
-  s += CmtSystem::file_separator ();
-  s += get_package_name ();
+  if (style != none_style)
+    {
+      s += CmtSystem::file_separator ();
+      s += get_package_name ();
+    }
   
-  if (style != no_version_style)
+  //  if (style != no_version_style)
+  if (structuring_style == with_version_directory)
     {
       s += CmtSystem::file_separator ();
@@ -3039 +3079 @@
       buffer += " \"";
       buffer += real_path;
-      buffer += fs;
-      buffer += package_name;
-      if (style != no_version_style)
+      if (style != none_style)
+        {
+          buffer += fs;
+          buffer += package_name;
+        }
+      //      if (style != no_version_style)
+      if (structuring_style == with_version_directory)
         {
           buffer += fs;
@@ -3169 +3213 @@
   else
     {
-      s = "../$(";
-      s += current_use.get_package_name ();
-      s += "_tag)/";
+      if (current_use.style != none_style)
+        {
+          s = "../$(";
+          s += current_use.get_package_name ();
+          s += "_tag)/";
+        }
+      else
+        {
+          s = "./";
+        }
       s += name;
     }
@@ -3298 +3349 @@
            */
           
+          if (style != none_style)
+            {
           libname = "${";
           libname += prefix;
@@ -3303 +3356 @@
           libname += get_package_name ();
           libname += "_tag}/";
+            }
+          else
+            {
+          libname = "${";
+          libname += prefix;
+          libname += "ROOT}/";
+            }
           libname += "$(library_prefix)";
           libname += library;
@@ -3324 +3384 @@
       if (!is_absolute)
         {
+          if (style != none_style)
+            {
           libname = "${";
           libname += prefix;
@@ -3329 +3391 @@
           libname += get_package_name ();
           libname += "_tag}/";
+            }
+          else
+            {
+          libname = "${";
+          libname += prefix;
+          libname += "ROOT}/";
+            }
           libname += library;
           libname += ".bundle";
@@ -3846 +3915 @@
       if (auto_imports == Off) cout << " (no_auto_imports)";
 
-      if (style == no_version_style) cout << " (no_version_directory)";
+      if (structuring_style == without_version_directory) cout << " (no_version_directory)";
+      //      if (style == no_version_style) cout << " (no_version_directory)";
 
       if (m_has_native_version)
@@ -4294 +4364 @@
 
 //----------------------------------------------------------
+class PackageReader : public Awk
+{
+public:
+
+  PackageReader ()
+  {
+  }
+  
+  const cmt_string& get_package () const
+  {
+    return (m_package);
+  }
+  
+  void filter (const cmt_string& line)
+  {
+    CmtSystem::cmt_string_vector words;
+    CmtSystem::split (line, " \t", words);
+    if (words[0] == "package")
+      {
+        m_package = words[1];
+      }
+  }
+  
+private:
+  cmt_string m_package;
+};
+
+//----------------------------------------------------------
 Package* Package::find (const cmt_string& name)
 {
@@ -4384 +4482 @@
           pos = v.find ('\r');
           if (pos != cmt_string::npos) v.erase (pos);
-          version = v;
-          return true;
+          if (v != "")
+            {
+              version = v;
+              return true;
+            }
         }
       else
@@ -4422 +4523 @@
 
   return (name);
+}
+
+//----------------------------------------------------------
+bool Package::get_name (cmt_string& name, const cmt_string& path)
+{
+  cmt_string name_file = path;
+  name_file += CmtSystem::file_separator ();
+  name_file += "requirements";
+  cmt_string text;
+  if (text.read (name_file))
+    {
+      PackageReader reader;
+      reader.run (text);
+      cmt_string v = reader.get_package ();
+      if (v != "")
+        {
+          name = v;
+          return true;
+        }
+    }
+  else
+    {
+      CmtMessage::warning ("Could not read `" + name_file + "'.");
+    }
+
+  return false;
 }