Changeset 461 for CMT/HEAD/source/cmt_awk.cxx

Timestamp:

Jun 24, 2008, 5:36:34 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 362

File:

• CMT/HEAD/source/cmt_awk.cxx (modified) (4 diffs)

CMT/HEAD/source/cmt_awk.cxx

@@ -14 +14 @@
 #include "cmt_system.h"
 #include "cmt_log.h"
+#include "cmt_use.h"
 
 class Parser
@@ -697 +698 @@
           vreq += CmtSystem::file_separator ();
           vreq += "cmt";
-          vreq += CmtSystem::file_separator ();
-          vreq += "version.cmt";
-
-          if (CmtSystem::test_file (vreq))
+          //      vreq += CmtSystem::file_separator ();
+          //      vreq += "version.cmt";
+
+          //      if (CmtSystem::test_file (vreq))
+          if (CmtSystem::test_file (vreq
+                                    + CmtSystem::file_separator ()
+                                    + Package::get_version_file_name ())
+              )
             {
-              version.read (vreq);
-              int pos;
-              pos = version.find ('\n');
-              if (pos != cmt_string::npos) version.erase (pos);
-              pos = version.find ('\r');
-              if (pos != cmt_string::npos) version.erase (pos);
-
+              Package::get_version (version, vreq);
+              
               a.run (entry, version, path, true);
               has_package = true;
@@ -876 +876 @@
           if (CmtSystem::test_file (req))
             {
-              cmt_string req;
-              
-              req = name;
-              req += CmtSystem::file_separator ();
-              req += "version.cmt";
-
               cmt_string version;
-              if (CmtSystem::test_file (req))
+              cmt_string v;
+              if (Package::get_version (v, name))
                 {
-                  version.read (req);
-                  int pos;
-                  pos = version.find ('\n');
-                  if (pos != cmt_string::npos) version.erase (pos);
-                  pos = version.find ('\r');
-                  if (pos != cmt_string::npos) version.erase (pos);
+                  version = v;
                 }
               else
@@ -896 +886 @@
                   version = "v*";
                 }
-
+              
               cout << package << " " << version << " " << path << endl;