Changeset 540 for CMT

Timestamp:

Mar 31, 2010, 6:36:09 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 427

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (2 diffs)
• source/cmt_vcs.cxx (modified) (5 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-03-31    <rybkin@lal.in2p3.fr> 427
+
+        * source/cmt_vcs.cxx: In method GlobalProjectAction::run, add container
+        with relative path (rather than absolute) which can be used for container
+        checkout. Same in method Packages::find, when adding package in case of
+        found package validation failure. In method Walkthru::filter, print warning
+        and return in case of macro reference(s) encountered when reading
+        requirements
+        * source/cmt_project.cxx: In function Project::order_all, fix setting of
+        current project pointer
+        
 2010-03-30    <rybkin@lal.in2p3.fr> 426
 

CMT/HEAD/source/cmt_project.cxx

@@ -1010 +1010 @@
       if (current_path_real.find (p.get_cmtpath_real ()) == 0)
         {
+          p_cur = &p;
           if (p.is_current ()) continue;
+
           p.set_is_current (true);
           //
@@ -1020 +1022 @@
           tag = Tag::add (p.get_name (), PriorityConfig, "PROJECT", 0);
           tag->mark ();
-
-          p_cur = &p;
         }
       else if (p.is_current ())

CMT/HEAD/source/cmt_vcs.cxx

@@ -158 +158 @@
         CmtMessage::verbose ("container " + use->get_info () +
                              " (" + use->real_path + ")");
-        Use* cuse = Use::add (use->real_path,
+        //      Use* cuse = Use::add (use->real_path,
+        Use* cuse = Use::add (use->path,
                               use->get_package_name (),
                               use->version,
@@ -352 +353 @@
               return p_use;
             }
-          Use* n_use = Use::add (use->real_path,
+          //      Use* n_use = Use::add (use->real_path,
+          Use* n_use = Use::add (use->path,
                                  use->get_package_name (),
                                  use->version,
@@ -622 +624 @@
       //      cerr << " `" + s + "'"; 
       if (s[0] == '-') continue;
+
+      if (s.find ("$(") != cmt_string::npos
+          || s.find ("${") != cmt_string::npos)
+        {
+          CmtMessage::warning (line +
+                               ": Skipped due to macro reference(s)."
+                               " Consider using -C option.");
+          return;
+        }
 
       switch (state)
@@ -4176 +4187 @@
         CmtMessage::warning (use->get_info () +
                              ": Skipped due to wildcards in version."
-                             " Consider using -C option.");
+                             " Consider using -C or -r HEAD option.");
         return;
       }
@@ -4242 +4253 @@
         CmtMessage::warning (use->get_info () +
                              ": Skipped due to wildcards in version."
-                             " Consider using -C option.");
+                             " Consider using -C or -r HEAD option.");
         return;
       }