Changeset 537 for CMT

Timestamp:

Mar 29, 2010, 12:33:45 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 424

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_commands.cxx (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_pattern.cxx (modified) (3 diffs)
• source/cmt_project.cxx (modified) (6 diffs)
• source/cmt_use.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-03-29    <rybkin@lal.in2p3.fr> 424
+
+        * source/cmt_commands.cxx: In functions option_path, option_use of class
+        ArgParser, validate current use object reset from command line options,
+        reorder and/or create projects, if needed
+        * source/cmt_project.cxx: In function ProjectFactory::create_project, do
+        not specify current project (and its tag). In function Project::order_all,
+        specify current project (and its tag) based on current directory path or
+        current use object real path, if the latter is located
+        * source/cmt_parser.cxx: In function Cmt::guess_current_project, make use
+        of current use object real path, if it is located, or current directory
+        path otherwise. This allows for doing setup with setup scripts generated
+        by "cmt config" from any place (with a correct CMTPROJECTPATH), resolving
+        ticket #57
+        * source/cmt_use.cxx: In function move_to, search for package in absolute
+        path first, if it is specified
+        * source/cmt_pattern.cxx: In function ApplyPattern::action, print warning
+        pattern_not_found in DeveloperMode (i. e., in current package) only
+        
 2010-03-26    <rybkin@lal.in2p3.fr> 423
 

CMT/HEAD/source/cmt_commands.cxx

@@ -1736 +1736 @@
                             cmt.m_current_version, 
                             cmt.m_current_path);
+
+      Use& use = Use::current();
+      if (use.get_package_name () == "cmt_standalone")
+        {
+          if (!CmtSystem::cd (use.path) || !CmtSystem::test_file ("requirements"))
+            {
+              CmtError::set (CmtError::package_not_found, use.get_info ());
+              return;
+            }
+          use.style = none_style;
+          use.structuring_style = without_version_directory;
+          use.change_path (CmtSystem::pwd ());
+        }
+      else if (!use.move_to ("", true))
+        {
+          CmtError::set (CmtError::package_not_found, use.get_info ());
+          return;
+        }
+      Project::order_all ();
+      Cmt::guess_current_project ();
     }
 }
@@ -1803 +1823 @@
       //IProjectFactory& factory = ProjectFactory::instance ();
       //CmtSystem::add_cmt_path (cmt.m_current_path, "argument", factory);
+      Use& use = Use::current();
+      if (use.get_package_name () == "cmt_standalone")
+        {
+          if (!CmtSystem::cd (use.path) || !CmtSystem::test_file ("requirements"))
+            {
+              CmtError::set (CmtError::package_not_found, use.get_info ());
+              return;
+            }
+          use.style = none_style;
+          use.structuring_style = without_version_directory;
+          use.change_path (CmtSystem::pwd ());
+        }
+      else if (!use.move_to ("", true))
+        {
+          CmtError::set (CmtError::package_not_found, use.get_info ());
+          return;
+        }
+      Project::order_all ();
+      Cmt::guess_current_project ();
     }
 }

CMT/HEAD/source/cmt_parser.cxx

@@ -4747 +4747 @@
   cmt_string here = CmtSystem::pwd ();
 
-  if (Project::find_in_cmt_paths (Me.m_current_dir) == "")
-    {
+  Use& use = Use::current();
+  cmt_string current_path (Me.m_current_dir);
+  if (use.located ())
+    {
+      current_path = use.real_path;
+      CmtMessage::verbose ("Using current use real_path `" + current_path + "'");
+    }
+
+  if (Project::find_in_cmt_paths (current_path) == "")
+    //  if (Project::find_in_cmt_paths (Me.m_current_dir) == "")
+    {
+      if (!CmtSystem::cd (current_path))
+        {
+          CmtError::set (CmtError::file_access_error, current_path);
+          CmtError::print ();
+          return;
+        }
       cmt_string project_file = "cmt";
       project_file += CmtSystem::file_separator ();
@@ -4790 +4805 @@
   Project::fill_cmtpaths (buffer);
   //cerr << "buffer = " << buffer << endl;
-  Use& use = Use::current();
+  //  Use& use = Use::current();
 
   bool save_quiet = Me.m_quiet;

CMT/HEAD/source/cmt_pattern.cxx

@@ -844 +844 @@
   if (p == 0) 
     {
+      if (Cmt::get_current_access () == DeveloperMode)
+        CmtMessage::warning (CmtError::get_error_name (CmtError::pattern_not_found) +
+                             ": " + name +
+                             " (applied by " + use->get_package_name () + ")"
+                             );
+      return;
+      /*
       if (use->get_current_scope () != ScopeUnspecified &&
           use->get_current_scope () != ScopePublic)
         return;
+      */
       /*
       cmt_string use_info (use->get_package_name () +
@@ -854 +862 @@
                            );
       */
-      CmtMessage::warning (CmtError::get_error_name (CmtError::pattern_not_found) +
-                           ": " + name +
-                           " (applied by " + use->get_package_name () + ")"
-                           );
       /*
         CmtError::set (CmtError::pattern_not_found, name +
@@ -869 +873 @@
         }
       */
-      return;
     }
 

CMT/HEAD/source/cmt_project.cxx

@@ -295 +295 @@
   */
   cmt_string pwd_real;
-  if (CmtSystem::realpath_ (pwd, pwd_real))
-    {
-      if (Cmt::get_current_dir_real ().find (pwd_real) == 0) is_current = true;
+  if (!CmtSystem::realpath_ (pwd, pwd_real))
+    {
+      CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
+                     pwd + "'");
+      CmtError::print ();
+      return 0;
+      //      if (Cmt::get_current_dir_real ().find (pwd_real) == 0) is_current = true;
     }
 
@@ -597 +601 @@
   project->set_cmtpath_source (source);
 
-  project->set_is_current (is_current);
-
+  //  project->set_is_current (is_current);
+  /*
   if (is_current)
     {
@@ -611 +615 @@
       tag->mark ();
     }
-
+  */
 
   //  Project::order_all ();
@@ -974 +978 @@
   OrderedProjects.resize (size);
 
+  Use& use = Use::current();
+  cmt_string current_path (Cmt::get_current_dir ());
+  if (use.located ())
+    {
+      current_path = use.real_path;
+      CmtMessage::verbose ("Using current use real_path `" + current_path + "'");
+    }
+
+  cmt_string current_path_real;
+  if (!CmtSystem::realpath_ (current_path, current_path_real))
+    {
+      CmtError::set (CmtError::file_access_error, "Cannot compute real path `" +
+                     current_path + "'");
+      CmtError::print ();
+      return;
+      //CmtMessage::error ("Cannot compute real path `" + Use::current().real_path + "'");
+    }
+
+  Project* p_cur (0);
   for (int i = 0; i < size; i++)
     {
@@ -982 +1005 @@
         p.m_order = -2;
       p.m_visits = 0;
+      //
+      // The current project specification
+      //
+      if (current_path_real.find (p.get_cmtpath_real ()) == 0)
+        {
+          if (p.is_current ()) continue;
+          p.set_is_current (true);
+          //
+          // The current project defines a tag with its name
+          //
+          
+          Tag* tag;
+          
+          tag = Tag::add (p.get_name (), PriorityConfig, "PROJECT", 0);
+          tag->mark ();
+
+          p_cur = &p;
+        }
+      else if (p.is_current ())
+        {
+          //
+          // Unset the tag with its name - TODO
+          //
+          p.set_is_current (false);
+        }
     }
 
@@ -1015 +1063 @@
     }
 
-  Project* p = get_current ();
+  Project* p (p_cur);
+  //  Project* p = get_current ();
 
   //  cerr << "get_current: " << p << " offset: " << offset << endl;

CMT/HEAD/source/cmt_use.cxx

@@ -1925 +1925 @@
   cmt_string expanded_path = path;
 
+  cmt_string here;
   if (curdir)
-    {
+    here = CmtSystem::pwd ();
+
+  //
+  // If the path specified in this use is a true absolute path,
+  // then we search the package from there first.
+  //
+  if (CmtSystem::absolute_path (expanded_path))
+    {
+      if (reach_package (expanded_path,  native_version))
+        {
+          if (Cmt::get_debug ())
+            {
+              cout << "move_to3> " << expanded_path << endl;
+            }
+
+          change_path (expanded_path);
+
+          return (true);
+        }
+      else if (alternate_versions.size () > 0)
+        {
+          if (select_alternate ()) 
+            {
+              if (Cmt::get_debug ())
+                {
+                  cout << "move_to5> " << real_path << endl;
+                }              
+
+              return (true);
+            }
+        }
+    }
+
   //
   // Try here.
   //
+  if (curdir)
+    {
 //   if (expanded_path == "")
 //     {
 //       if (reach_package ("", native_version))
-      cmt_string here = CmtSystem::pwd ();
       if (reach_package (here,  native_version))
         {
@@ -1957 +1991 @@
             }
         }
+      return (false);
 //     }
     } // end of curdir      
-
-  //
-  // If the path specified in this use is a true absolute path,
-  // then we search the package from there first.
-  //
-  if (CmtSystem::absolute_path (expanded_path))
-    {
-      if (reach_package (expanded_path,  native_version))
-        {
-          if (Cmt::get_debug ())
-            {
-              cout << "move_to3> " << expanded_path << endl;
-            }
-
-          change_path (expanded_path);
-
-          return (true);
-        }
-      else if (alternate_versions.size () > 0)
-        {
-          if (select_alternate ()) 
-            {
-              if (Cmt::get_debug ())
-                {
-                  cout << "move_to5> " << real_path << endl;
-                }              
-
-              return (true);
-            }
-        }
-    }
-  if (curdir) return (false);
       
   //