Changeset 664 for CMT/v1r25-branch/source/cmt_use.cxx

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_use.cxx (modified) (24 diffs)

CMT/v1r25-branch/source/cmt_use.cxx

@@ -3 +3 @@
 // arnault@lal.in2p3.fr
 // Modified by garonne@lal.in2p3.fr
+// Modified by Grigory Rybkin
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -1826 +1827 @@
   m_located = false;
   m_package = 0;
+  m_project = 0;
   m_index = -1;
 
@@ -1848 +1850 @@
       m_package = 0;
     }
+  m_project = 0;
 
   version   = "";
@@ -1923 +1926 @@
 
 //----------------------------------------------------------
-void Use::change_path (const cmt_string& new_path)
+void Use::change_path (const cmt_string& new_path, const Project* project)
 {
   // 
@@ -1929 +1932 @@
   // where this package/version has been found.
   //
+  if (Cmt::get_debug ())
+    {
+      cout << "|Use::change_path> path: " << new_path
+           << " project: " << (project ? project->get_cmtpath () : "0")
+           << " use: " << get_info () << endl;
+    }
 
   real_path = "";
   m_realpath = "";
 
-  if (new_path != "")
+  m_project = 0;
+
+  if (new_path.size () != 0)
+    //  if (new_path != "")
     {
       if ((path.size () > 0) &&
@@ -1951 +1963 @@
       if (!CmtSystem::realpath_ (real_path, m_realpath))
         {
-          CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
-                         real_path + "'");
+          CmtError::set (CmtError::file_access_error,
+                         "Cannot compute real path `" + real_path + "': " +
+                         get_info ());
           CmtError::print ();
           return;
@@ -1958 +1971 @@
     }
   
+  if (project)
+    m_project = project;
+
   m_located = true;
+
+  if (Cmt::get_debug ())
+    {
+      cout << "<Use::change_path| real_path: " << real_path
+           << " m_project: " << (m_project ? m_project->get_cmtpath () : "0")
+           << " use: " << get_info () << endl;
+    }
 }
 
@@ -2347 +2370 @@
           }
         
-        m_use->change_path (path);
+        m_use->change_path (path, &project);
 
         m_found = true;
@@ -2355 +2378 @@
     else if (m_use->alternate_versions.size () > 0)
       {
-        if (m_use->select_alternate ()) 
+        if (m_use->select_alternate (&project)) 
           {
             if (Cmt::get_debug ())
@@ -2448 +2471 @@
               cout << "move_to2> " << expanded_path << endl;
             }
-
           change_path (here);
-
           return (true);
         }
@@ -2461 +2482 @@
                   cout << "move_to5> " << real_path << endl;
                 }
-              
               return (true);
             }
         }
+
+      if (!CmtSystem::cd (here))
+        {
+          CmtError::set (CmtError::file_access_error, here);
+        }
       return (false);
 //     }
@@ -2482 +2507 @@
 
 //----------------------------------------------------------
-bool Use::select_alternate ()
+bool Use::select_alternate (const Project* project)
 {
   int i;
@@ -2567 +2592 @@
                 }
 
-              change_path (alternate_paths[selected_index]);
+              change_path (alternate_paths[selected_index], project);
               return (true);
             }
@@ -3568 +3593 @@
   offset = "";
 
-  cmtpath = m_realpath.size ()
-    ? Project::find_in_cmt_paths (m_realpath, true)
-    : Project::find_in_cmt_paths (real_path)
-    ;
-  const Project* p = Project::find_by_cmtpath (cmtpath);
-
+  const Project* p (0);
+  if (m_project)
+    {
+      p = m_project;
+      cmtpath = p->get_cmtpath ();
+    }
+  else
+    {
+      cmtpath = m_realpath.size ()
+        ? Project::find_in_cmt_paths (m_realpath, true)
+        : Project::find_in_cmt_paths (real_path)
+        ;
+      p = Project::find_by_cmtpath (cmtpath);
+  //  const Project* p = Project::find_by_cmtpath (cmtpath);
+    }
   //  if (cmtpath != "")
   if (p != 0)
@@ -3590 +3624 @@
       else if (!CmtSystem::realpath_ (real_path, offset))
         {
-          CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
-                         real_path + "'");
+          CmtError::set (CmtError::file_access_error,
+                         "Cannot compute real path `" + real_path + "': " +
+                         get_info ());
           CmtError::print ();
           return;
@@ -3619 +3654 @@
 bool Use::get_strategy (const cmt_string& name) const
 {
-  const Project* p =
+  const Project* p = get_project ();
+    /*
     Project::find_by_cmtpath (m_realpath.size ()
                               ? Project::find_in_cmt_paths (m_realpath, true)
                               : Project::find_in_cmt_paths (real_path)
                               );
-  //  const Project* p = Project::find_by_cmtpath (Project::find_in_cmt_paths (real_path));
+    */
 
   bool strategy;
@@ -3705 +3741 @@
   buffer += "\n";
 
-  if (located ())
+  if (m_located)
+    //  if (located ())
     {
       buffer += "macro ";
@@ -3725 +3762 @@
           buffer += package_name;
         }
-      //      if (style != no_version_style)
       if (structuring_style == with_version_directory)
         {
@@ -3733 +3769 @@
       buffer += "\"";
       buffer += "\n";
+    }
+
+  if (action_setup == Cmt::get_action () &&
+      Requirements == Cmt::get_print_mode ())
+    {
+      //cerr << "|Use::fill_standard_macros> Checking for " << prefix << "CONFIG" << endl;
+      if (!discarded &&
+          get_package_name () != "cmt_standalone" &&
+          get_strategy ("SetupConfig"))
+        {
+          buffer += "macro ";
+          buffer += prefix;
+          buffer += "CONFIG";
+          buffer += " \"";
+          buffer += CmtSystem::get_cmt_config ();
+          buffer += "\"";
+          buffer += "\n";
+        }
     }
 
@@ -3764 +3818 @@
   buffer += "\n";
   
-  Project* p = Project::find_by_cmtpath (cmtpath);
+  const Project* p = m_project
+    ? m_project
+    : Project::find_by_cmtpath (cmtpath)
+    ;
+  /*
+  const Project* p (m_project);
+  if (!p)
+    p = Project::find_by_cmtpath (cmtpath);
+  */
 
   buffer += "macro ";
@@ -4520 +4582 @@
   static const cmt_string null = "";
 
+  return m_package ? m_package->get_name () : null ;
+  /*
   Package* p = m_package;
   if (p == 0) return (null);
 
   return (p->get_name ());
+  */
 }
 
@@ -4829 +4894 @@
 
   return (is_in_path);
-}
-
-//----------------------------------------------------------
-bool Use::located () const
-{
-  return (m_located);
 }
 
@@ -5736 +5795 @@
 
 //----------------------------------------------------------
-Project* Use::get_project ()
+const Project* Use::get_project () const
 {    
+  if (m_project)
+    return m_project;
+
+  return Project::find_by_cmtpath (m_realpath.size ()
+                                   ? Project::find_in_cmt_paths (m_realpath, true)
+                                   : Project::find_in_cmt_paths (real_path)
+                                   );
+  /*
+  cmt_string cmtpath = m_realpath.size ()
+    ? Project::find_in_cmt_paths (m_realpath, true)
+    : Project::find_in_cmt_paths (real_path)
+    ;
+  return Project::find_by_cmtpath (cmtpath);
+  */
+  /*
   Project* p;
   cmt_string cmtpath = "";
@@ -5744 +5818 @@
   p = Project::find_by_cmtpath (cmtpath);
   return p;   
+  */
 }