Changeset 138

Timestamp:

Jan 31, 2006, 2:27:50 PM (18 years ago)

Author:

garonne

Message:

fixe problems with show clients

Location:

CMT/HEAD/source

Files:

• cmt_awk.cxx (modified) (10 diffs)
• cmt_awk.h (modified) (1 diff)
• cmt_parser.cxx (modified) (11 diffs)
• cmt_project.cxx (modified) (3 diffs)

CMT/HEAD/source/cmt_awk.cxx

@@ -611 +611 @@
   if (level > 10)
     {
-      //cout << "#PathScanner::scan_path> too deep search path=" << path << endl;
+      cout << "#PathScanner::scan_path> too deep search path=" << path << endl;
       return;
     }
@@ -618 +618 @@
   // Only do something if it is a directory.
   //
-
   if (!CmtSystem::test_directory (path)) return;
+  
 
   CmtSystem::cmt_string_vector list;
@@ -645 +645 @@
       if (!CmtSystem::test_directory (here)) continue;
 
-      name = "";
+      name    = "";
       version = "";
 
@@ -663 +663 @@
       req += CmtSystem::file_separator ();
       req += "requirements";
-
+      
       if (CmtSystem::test_file (req))
         {
@@ -673 +673 @@
           CmtSystem::basename (path, name);
 
-          // cout << "#1" << endl;
+          //cout << "#1" << endl;
 
           a.run (name, version, where);
@@ -718 +718 @@
               //cout << "#2" << endl;
 
-              a.run (entry, version, path);
+              a.run (entry, version, path, true);
               has_package = true;
               
@@ -764 +764 @@
                   // The structure is with the version directory.
                   
-                  //cout << "#4" << endl;
+                  // cout << "#4" << endl;
 
                   a.run (name, version, where);
@@ -788 +788 @@
           if (CmtSystem::is_version_directory (version))
             {
-              // cout << "#5" << endl;
+              //cout << "#5" << endl;
 
               a.run (entry, version, where);
@@ -801 +801 @@
           where += entry;
 
-          // cout << "#6" << endl;
+          //cout << "#6" << endl;
 
           a.run (name, "v1", where);
@@ -828 +828 @@
           p += e;
 
-            /*
-          for (j = 1; j < _level; j++) cout << "  ";
+            
+          for (int j = 1; j < _level; j++) cout << "  ";
           cout << "Restarting scan_path on p=" << p << endl;
-            */
+            
 
           cout << "#PathScanner::scan_path> Restarting scan_path on p=" << p << endl;

CMT/HEAD/source/cmt_awk.h

@@ -111 +111 @@
     virtual void run (const cmt_string& package,
                       const cmt_string& version,
-                      const cmt_string& path)
+                      const cmt_string& path,
+                      const bool without_version_directory=false)
     {
     }

CMT/HEAD/source/cmt_parser.cxx

@@ -111 +111 @@
   void run (const cmt_string& package,
             const cmt_string& version,
-            const cmt_string& path);
+            const cmt_string& path,
+            const bool without_version_directory=false);
 };
 
@@ -125 +126 @@
   void run (const cmt_string& package,
             const cmt_string& version,
-            const cmt_string& path);
+            const cmt_string& path,
+            const bool without_version_directory=false);
 private:
   CmtSystem::cmt_string_vector& m_uses;
@@ -143 +145 @@
   void run (const cmt_string& package,
             const cmt_string& version,
-            const cmt_string& path);
+            const cmt_string& path,
+            const bool without_version_directory=false);
   int count ();
 
@@ -155 +158 @@
 void PackageViewer::run (const cmt_string& package,
                          const cmt_string& version,
-                         const cmt_string& path)
+                         const cmt_string& path,
+                         const bool without_version_directory)
 {
   cout << package << " " << version << " " << path << endl;
@@ -168 +172 @@
 void PackageSelector::run (const cmt_string& package,
                            const cmt_string& version,
-                           const cmt_string& path)
+                           const cmt_string& path,
+                           const bool without_version_directory)
 {
   //
@@ -235 +240 @@
 void ClientCollector::run (const cmt_string& package,
                            const cmt_string& version,
-                           const cmt_string& path)
+                           const cmt_string& path,
+                           const bool without_version_directory)
 {
   cmt_string dir = path;
   dir += CmtSystem::file_separator ();
   dir += package;
-  dir += CmtSystem::file_separator ();
-  if (version != "")
+  dir += CmtSystem::file_separator ();      
+  if (version != "" && ! without_version_directory)
     {
       dir += version;
@@ -248 +254 @@
 
   cmt_string req;
-
-  req = dir;
+ 
+  req  = dir;
   req += "cmt";
   req += CmtSystem::file_separator ();
@@ -318 +324 @@
           CmtSystem::split (line, " \t", words);
 
-          if ((words.size () > 2) && (words[0] == "use")) 
+          if ((words.size () >= 2) && (words[0] == "use")) 
             {
               if ((words[1] == m_package) && 
-                  ((words[2] == m_version) || (m_version == "")))
+                  ( (m_version == "") || (words[2] == m_version)))
                 {
                   cout << "# " << package << " " << version << " " << path;
-                  if (m_version == "")
+                  if (m_version == "" && words.size () > 2)
                     {
                       cout << " (use version " << words[2] << ")";
@@ -3288 +3294 @@
 void Cmt::do_show_clients (const ArgParser& ap)
 {
-  cmt_string package;
-  cmt_string version;
-  cmt_string path_name;
-
-  if (ap.arguments.size () >= 1) package = ap.arguments[0];
-  if (ap.arguments.size () >= 2) version = ap.arguments[1];
+  cmt_string package   = "";
+  cmt_string version   = "";
+  cmt_string path_name = "";
+
+  if (ap.arguments.size () >= 1) package  = ap.arguments[0];
+  if (ap.arguments.size () >= 2) version  = ap.arguments[1];
   if (ap.arguments.size () >= 3) path_name = ap.arguments[2];
 
@@ -3299 +3305 @@
   ClientCollector collector (package, version);
 
-  clear ();
+  clear     ();
   configure ();
 
@@ -3554 +3560 @@
   if (ap.arguments.size () > 0) path_name = ap.arguments[0];
 
-  PathScanner scanner;
+  PathScanner   scanner;
   PackageViewer viewer;
 

CMT/HEAD/source/cmt_project.cxx

@@ -204 +204 @@
   sep = CmtSystem::path_separator ();
 
-  cmt_string cmtprojectpath = Symbol::get_env_value ("CMTPROJECTPATH");
+  cmt_string cmtprojectpath = Symbol::get_env_value ("CMTPROJECTPATH"); 
   CmtSystem::cmt_string_vector items;
   CmtSystem::split (cmtprojectpath, sep, items);
@@ -978 +978 @@
   for (i = 0; i < Projects.size (); i++)
     {
-      Project& p = Projects[i];
+      Project& p  = Projects[i];
       p.m_visited = false;
     }
@@ -985 +985 @@
     {
       const Project& project = Projects[i];
-
+       
       const cmt_string& p = project.m_cmtpath;
       scanner.scan_path (p, a);