Changeset 582 for CMT/HEAD

Timestamp:

Jun 9, 2011, 10:24:57 AM (13 years ago)

Author:

rybkin

Message:

See C.L. 460

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_use.cxx (modified) (2 diffs)
• source/cmt_use.h (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-06-09    <rybkin@lal.in2p3.fr> 460
+
+        * source/cmt_use.cxx: In class Use, function reach_package, add package
+        selection criterion based on <package>_native_version (-native_version=VERSION option)
+        in case of CMT structuring style without_version_directory (similarly to
+        style with_version_directory), in function add, add mention of
+        native_version, if specified, to warning message
+        * source/cmt_use.h: In class Use, make function clear public (rather than
+        making class Project friend)
+        
 2011-06-08    <rybkin@lal.in2p3.fr> 459
 

CMT/HEAD/source/cmt_use.cxx

@@ -2052 +2052 @@
 
       //      style = no_version_style;
+      if (n_version != "")
+        {
+          cmt_string path ("cmt");
+          path += CmtSystem::file_separator ();
+          path += "native_version.cmt";        
+          if (!CmtSystem::test_file (path)) return (0);
+
+          cmt_string nv;
+          if (!nv.read (path))
+            {
+              CmtError::set (CmtError::file_access_error,
+                             CmtSystem::pwd () + CmtSystem::file_separator () + path);
+              return (0);
+            }
+          int pos = nv.find ('\n');
+          if (pos != cmt_string::npos) nv.erase (pos);
+          pos = nv.find ('\r');
+          if (pos != cmt_string::npos) nv.erase (pos);
+          if (Cmt::get_debug ())
+            {
+              cout << "Use::reach_package-6.0> native_version found " << nv << " (required " << n_version << ")" << endl;
+            }
+          if (nv != n_version) return (0);
+          this->native_version   = n_version;
+        }
 
       cmt_string v;
@@ -3030 +3055 @@
       CmtMessage::warning (CmtError::get_error_name (CmtError::package_not_found)
                            + ": " + use->get_info ()
+                           + (native_version != "" ?
+                              " -native_version=" + native_version : "")
                            + ( (context_use != 0) ?
-                               " (requested by " + context_use->get_package_name () + ")" :
-                               "" )
+                               " (requested by " + context_use->get_package_name () + ")" : "" )
                            );
       /*

CMT/HEAD/source/cmt_use.h

@@ -17 +17 @@
 class Package;
 class UseProjectAction;
-class Project;
 
 class Use
@@ -152 +151 @@
   cmt_string get_info () const;
   bool is_head_version (const cmt_string& version);
+  void clear ();
 // Public attributes
 public:
@@ -194 +194 @@
 // Private methods
 private:
-  void clear ();
+  //  void clear ();
   int reach_package (const cmt_string& current_path, const cmt_string& n_version="");
   void select ();
@@ -241 +241 @@
 
   friend class UseProjectAction;
-  friend class Project;
 };