Changeset 409 for cmtcvs/HEAD

Timestamp:

Apr 24, 2007, 11:33:37 PM (17 years ago)

Author:

arnault

Message:

First installation in SVN

Fix a bug in check_newer
CL 5

Location:

cmtcvs/HEAD

Files:

• ChangeLog (modified) (1 diff)
• cmt/requirements (modified) (1 diff)
• src/cmtcvs.cxx (modified) (6 diffs)

cmtcvs/HEAD/ChangeLog

@@ +1 @@
+2007-04-24    <arnault@lal.in2p3.fr> 5
+
+        * src/cmtcvs.cxx: Fix a bug in check_newer
+        * cmt/requirements: Set the tags for Unix in general
+
 2005-05-09  Christian Arnault  <arnault@lal.in2p3.fr> 4
 

cmtcvs/HEAD/cmt/requirements

@@ -13 +13 @@
 
 macro_append cppflags "" \
-             Linux ' -O2 -Wno-deprecated -DVERSION=$(q)V(v1r1)$(q)' \
+             Unix ' -O2 -Wno-deprecated -DVERSION=$(q)V(v1r1)$(q)' \
              WIN32 ' /DVERSION=$(q)V(v1r1)$(q)'
 

cmtcvs/HEAD/src/cmtcvs.cxx

@@ -87 +87 @@
 
 //---------------------------------------------------------------------
+// Question: is v1 newer than v2?
+//
 static bool check_newer (const cmt_string& v1,
                          const cmt_string& v2)
@@ -102 +104 @@
   int n2 = list2.size ();
 
-    //cout << "checknewer v1=" << v1 << " v2=" << v2 << " n1=" << n1 << " n2=" << n2 << endl;
-
+  //cerr << "checknewer v1=" << v1 << " v2=" << v2 << " n1=" << n1 << " n2=" << n2 << endl;
+
+  /*
+     v1 = a1.a2.a3.a4
+     v2 = b1.b2.b3
+
+     {i = 0.. min(n1,n2) | if (ai > bi) -> [v1 newer than v2] }  [1.2.5 vs 1.2.4]
+
+     then
+        if (n1 < n2} [v2 newer]     [1.2  vs 1.2.5]
+        if (n1 > n2) [v1 newer]     [1.2.5 vs 1.2]
+     
+  */
+  
   for (int i = 0; i < n1; ++i)
     {
-      if (i >= n2) return (false);
+      if (i >= n2)
+        {
+          // cerr << "n1 > n2" << endl;
+          return (false);
+        }
 
       const cmt_string& s1 = list1[i];
@@ -117 +135 @@
       i2 = atoi (s2.c_str ());
 
-        //cout << "    i1=" << i1 << " i2=" << i2 << endl;
-
-      if (i1 > i2) return (true);
-    }
+      //cerr << "    i1=" << i1 << " i2=" << i2 << endl;
+
+      if (i1 > i2) return (true); // v1 newer
+      if (i1 < i2) return (false); // v2 newer
+    }
+
+  // n2 > n1
+  // v2 newer
+
+  //cerr << "n2 > n1" << endl;
 
   return (false);
@@ -270 +294 @@
   temp.erase (pos);
 
-    //cout << "temp=[" << temp << "]" << endl;
+  //cerr << "temp=[" << temp << "]" << endl;
 
   CmtSystem::cmt_string_vector words;
@@ -286 +310 @@
       int n = w.size ();
 
-        //cout << "level=" << n << endl;
+      //cerr << "level=" << n << endl;
 
       if ((n == 2) ||
@@ -312 +336 @@
       v.erase (0, pos+1);
 
-        // cout << "cvsv=" << v << " top=" << top << endl;
+      //cerr << "s=" << s << " v=" << v << " top=" << top << endl;
 
       if (check_newer (v, top))
         {
+          //cerr << v << " plus recent que " << top << endl;
           top = v;
         }
     }
 
-    //cout << "cvstopv=" << top << endl;
+  // cerr << "topv=" << top << endl;
 
   bool has_container = false;