Changeset 528 for CMT/HEAD/source

Timestamp:

Nov 25, 2009, 12:11:28 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 415

Location:

CMT/HEAD/source

Files:

• cmt_awk.cxx (modified) (2 diffs)
• cmt_commands.cxx (modified) (4 diffs)
• cmt_error.cxx (modified) (1 diff)
• cmt_error.h (modified) (1 diff)
• cmt_fragment.cxx (modified) (2 diffs)
• cmt_language.cxx (modified) (2 diffs)
• cmt_parser.cxx (modified) (8 diffs)
• cmt_project.cxx (modified) (2 diffs)
• cmt_system.cxx (modified) (1 diff)
• cmt_use.cxx (modified) (1 diff)

CMT/HEAD/source/cmt_awk.cxx

@@ -648 +648 @@
 
       if ((level == 0) && (entry == "InstallArea")) continue;
-      if (entry == "CVS") continue;
+      if (entry == ".svn" || entry == "CVS") continue;
 
       cmt_string req;
@@ -742 +742 @@
                   // The structure is without the version directory.
                   
-                  a.run (name, "v1", path);
+                  if (!Package::get_version (version, vreq))
+                    version = "v*";
+
+                  a.run (name, version, path, true);
+                  //              a.run (name, "v1", path);
                   has_package = true;
                   

CMT/HEAD/source/cmt_commands.cxx

@@ -1422 +1422 @@
           if (argc > 0)
             {
-              cmt.m_current_target = fill_one_argument ();
+              fill_arguments ();
+              //              cmt.m_current_target = fill_one_argument ();
             }
 
@@ -2241 +2242 @@
   help_texts.add () =  "show  author            :  package author";
   help_texts.add () =  "show  branches          :  added branches";
-  help_texts.add () =  "show  clients           :  package clients";
+  help_texts.add () =  "show  clients <package> [<version> [<path>]] :  clients of <package> [of <version> [in <path>]]";
   help_texts.add () =  "show  cmtpath_patterns  :  cmtpath_patterns";
   help_texts.add () =  "show  constituent <name>:  constituent definition";
   help_texts.add () =  "show  constituent_names :  constituent names";
   help_texts.add () =  "show  constituents      :  constituent definitions";
+  help_texts.add () =  "show  container         :  container package of current project";
   help_texts.add () =  "show  cycles            :  cycles in the use graph";
   help_texts.add () =  "show  fragment <name>   :  one fragment definition";
@@ -2258 +2260 @@
   help_texts.add () =  "show  macros            :  all macro definitions";
   help_texts.add () =  "show  manager           :  package manager";
-  help_texts.add () =  "show  packages          :  packages reachable from the current context";
+  help_texts.add () =  "show  packages [<path>]... :  packages reachable from the current context [or <path>s]";
   help_texts.add () =  "show  path [-d]         :  the package search paths list [in detail]";
   help_texts.add () =  "show  pattern <name>    :  the pattern definition and usages";
@@ -2273 +2275 @@
   help_texts.add () =  "show  strategies        :  all strategies (build & version)";
   help_texts.add () =  "show  tags              :  all currently active tags";
-  help_texts.add () =  "show  use_paths <pack>  :  all paths to the used package";
+  help_texts.add () =  "show  use_paths <package> :  all use paths to the used <package>";
   help_texts.add () =  "show  uses              :  used packages";
   help_texts.add () =  "show  version           :  version of the current package";
-  help_texts.add () =  "show  versions <name>   :  visible versions of the selected package";
+  help_texts.add () =  "show  versions <package> :  visible versions of the selected <package>";
   help_texts.add () =  "system                  : display the system tag";
   help_texts.add () =  "unlock [<p> <v> [<path>]] : unlock a package";

CMT/HEAD/source/cmt_error.cxx

@@ -21 +21 @@
     error_names.add() = "symbol not found";
     error_names.add() = "pattern not found";
+    error_names.add() = "constituent not found";
+    error_names.add() = "fragment not found";
+    error_names.add() = "language not found";
     error_names.add() = "syntax error";
     error_names.add() = "command_not_implemented";

CMT/HEAD/source/cmt_error.h

@@ -22 +22 @@
     symbol_not_found,
     pattern_not_found,
+    constituent_not_found,
+    fragment_not_found,
+    language_not_found,
     syntax_error,
     command_not_implemented,

CMT/HEAD/source/cmt_fragment.cxx

@@ -16 +16 @@
 #include "cmt_database.h"
 #include "cmt_log.h"
+#include "cmt_error.h"
 
 /*----------------------------------------------------------*/
@@ -138 +139 @@
   if (fragment == 0)
     {
-      CmtMessage::info ("Fragment " + name + " not found");
+      cmt_string t (name);
+      //      t += " is not defined";
+      CmtError::set (CmtError::fragment_not_found, t);
+      //      CmtMessage::info ("Fragment " + name + " not found");
       //      cerr << "Fragment " << name << " not found" << endl;
     }

CMT/HEAD/source/cmt_language.cxx

@@ -13 +13 @@
 #include "cmt_system.h"
 #include "cmt_database.h"
+#include "cmt_error.h"
 
 /*----------------------------------------------------------*/
@@ -26 +27 @@
   Language& language = find (name);
 
-  if (language == null ()) return;
-
-  language.show ();
+  if (language == null ())
+    {
+      cmt_string t (name);
+
+      CmtError::set (CmtError::language_not_found, t);
+    }
+  else
+    {
+      language.show ();
+    }
 }
 

CMT/HEAD/source/cmt_parser.cxx

@@ -2687 +2687 @@
   //  configure_current_package ();
 
-  Generator::build_default_makefile ();
+  //  Generator::build_default_makefile ();
   
   CmtSystem::cd ("..");    
@@ -2714 +2714 @@
   install_setup_scripts ();
   install_cleanup_scripts ();
+
+  Generator::build_default_makefile ();
 
   CmtSystem::cd ("..");
@@ -3732 +3734 @@
   if (symbol == 0) 
     {
-      cmt_string t = " ";
-      t += target;
-      t += " is not defined ";
+      cmt_string t (target);
+      t += " is not defined";
 
       CmtError::set (CmtError::symbol_not_found, t);
@@ -3881 +3882 @@
   configure (ap);
 
-  cout << "# ----------- Clients of " << package <<
-    " " << version <<
-    " " << path_name <<
-    endl;
+  cout << "# ----------- Clients of " << package
+       << (version != "" ? " " + version : "")
+       << (path_name != "" ? " (" + path_name + ")": "")
+    //    " " << version <<
+    //    " " << path_name <<
+       << endl;
 
   if (path_name == "")
@@ -3916 +3919 @@
         {
           c->show ();
+        }
+      else
+        {
+          cmt_string t (ap.arguments[0]);
+          CmtError::set (CmtError::constituent_not_found, t);
         }
     }
@@ -4138 +4146 @@
 void Cmt::do_show_packages (const ArgParser& ap)
 {
-  cmt_string path_name;
-
-  if (ap.arguments.size () > 0) path_name = ap.arguments[0];
-
   PathScanner   scanner;
   PackageViewer viewer;
 
-  if (path_name == "")
+  if (ap.arguments.size () == 0)
     {
       Project::scan_paths (scanner, viewer);
@@ -4151 +4155 @@
   else
     {
-      scanner.scan_path (path_name, viewer);
+      for (int i = 0; i < ap.arguments.size (); i++)
+        {
+          const cmt_string& path_name = ap.arguments[i];
+          if (CmtSystem::test_directory (path_name))
+            {
+              scanner.scan_path (path_name, viewer);
+            }
+          else
+            {
+              CmtMessage::warning ("No such directory: " + path_name);
+              CmtError::set (CmtError::path_not_found, path_name);
+            }
+        }
     }
 }
@@ -4378 +4394 @@
   Use* current = &(Use::current());
 
-  current->get_all_clients (to_name);
+  if (!current->get_all_clients (to_name))
+    CmtError::set (CmtError::package_not_found, to_name);
 }
 

CMT/HEAD/source/cmt_project.cxx

@@ -1422 +1422 @@
   static ProjectVector& Projects = projects ();
 
+  bool found (false);
   for (int i = 0; i < Projects.size (); i++)
     {
@@ -1427 +1428 @@
 
       const cmt_string& p = project.m_cmtpath;
-      scanner.scan_package (p, name);
-    }
+      if (scanner.scan_package (p, name))
+        found = true;
+    }
+
+  if (!found)
+    CmtError::set (CmtError::package_not_found, name);
 }
 

CMT/HEAD/source/cmt_system.cxx

@@ -2450 +2450 @@
   /* 
    * The idea and, to some extent, implementation of this function
-   * was borrowed from the GNU core utilities of the Free Software Foundation
+   * were borrowed from the GNU core utilities of the Free Software Foundation
    * http://www.gnu.org/software/coreutils/
    */

CMT/HEAD/source/cmt_use.cxx

@@ -3513 +3513 @@
   if (use == 0)
     {
-      CmtMessage::warning ("No access to " + to_name);
-      //      cerr << "#CMT> No access to " << to_name << endl;
+      //      CmtMessage::warning ("No access to " + to_name);
       return (false);
     }