Changeset 482 for CMT

Timestamp:

Nov 29, 2008, 5:20:44 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 377

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_commands.cxx (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_project.cxx (modified) (1 diff)
• source/cmt_project.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-11-29    <rybkin@lal.in2p3.fr> 377
+        
+        * source/cmt_project.cxx: In function show_paths, introduce and implement
+        the -d option of the "cmt show path" command to show how the the package
+        search paths list is formed (default: the original succinct one line per
+        path output)
+        * source/cmt_project.h: idem
+        * source/cmt_parser.cxx: idem
+        * source/cmt_commands.cxx: idem. Add help text for the introduced option.
+        
 2008-11-28    <rybkin@lal.in2p3.fr> 376
         
         * source/cmt_parser.cxx: In function fill_for_all_constituents, ensure that
         the <constituent>_use_linkopts macro is set in case the constituent
-        -import=<package> options constituent effectively import nothing
+        -import=<package> options effectively import nothing
 
 2008-11-18    <rybkin@lal.in2p3.fr> 375

CMT/HEAD/source/cmt_commands.cxx

@@ -1423 +1423 @@
       else if (arg == "path")
         {
-          cmt.m_action = action_show_path;
+          if (argc == 0)
+            {
+              cmt.m_action = action_show_path;
+            }
+          else if (argc == 1 && cmt_string (argv[0]) == "-d")
+            {
+              fill_one_argument ();
+              cmt.m_action = action_show_path;
+            }
+          else
+            {
+              cmt.m_action = action_show_path;
+              help_action = action_help;
+            }
         }
       else if (arg == "pattern")
@@ -2240 +2253 @@
   help_texts.add () =  "show  manager           :  package manager";
   help_texts.add () =  "show  packages          :  packages reachable from the current context";
-  help_texts.add () =  "show  path              :  the package search list";
+  help_texts.add () =  "show  path [-d]         :  the package search paths list [in detail]";
   help_texts.add () =  "show  pattern <name>    :  the pattern definition and usages";
   help_texts.add () =  "show  pattern_names     :  pattern names";

CMT/HEAD/source/cmt_parser.cxx

@@ -4076 +4076 @@
 
 //----------------------------------------------------------
-void Cmt::do_show_path (const ArgParser& /*ap*/)
-{
-  Project::show_paths ();
+void Cmt::do_show_path (const ArgParser& ap)
+{
+  Project::show_paths (ap.arguments);
 }
 

CMT/HEAD/source/cmt_project.cxx

@@ -1057 +1057 @@
 
 /*----------------------------------------------------------*/
-void Project::show_paths ()
-{
-  VisitorForShowPaths visitor;
-
-  start_visit (visitor);
+void Project::show_paths (const CmtSystem::cmt_string_vector& arguments)
+//void Project::show_paths ()
+{
+  if (arguments.size () == 0)
+    {
+      const ProjectPtrVector Ordered = Project::ordered_projects ();
+      for (int i = 0; i < Ordered.size (); i++)
+        {
+          const Project* p = Ordered[i];
+          const cmt_string& w = p->get_cmtpath_pwd ();
+          const cmt_string& s = p->get_cmtpath_source ();
+          
+          if (s == "default path") continue;
+          
+          if (CmtSystem::test_directory (w))
+            {
+              cout << "# Add path " << w << " from " << s << endl;
+            }
+        }
+    }
+  else if (arguments.size () == 1 && cmt_string (arguments[0]) == "-d")
+    {
+      VisitorForShowPaths visitor;
+      start_visit (visitor);
+    }
+  else
+    CmtMessage::error ("show_paths: unexpected argument(s)");
 }
 

CMT/HEAD/source/cmt_project.h

@@ -113 +113 @@
   static void show_all ();
   static void show_specified_strategies_for_all ();
-  static void show_paths ();
+  static void show_paths (const CmtSystem::cmt_string_vector& arguments);
+  //  static void show_paths ();
   static const cmt_string& get_project_file_name ();