Merge branch 'master' of ssh://boinc.berkeley.edu/boinc

checkin_notes

@@ -6820,3 +6820,20 @@ Rom    14 Nov 2012
         ziptest.vcproj (Deleted)
         boinc_zip.cpp
         boinc_zip.vcproj (Deleted)
+
+Charlie 15 Nov 2012
+    - boinc_zip: updated boinc_zip to use current info-zip source files 
+        (info-zip 3.0 and info-unzip 6.0) and to build on Mac and Windows.
+        Added a vc project to build boinc_zip_test, not yet working.
+        Also update Makefile.am, but this has not been tested.
+
+    zip/
+        boinc_zip.cpp,.h
+        boinc_zip.xcodeproj/
+            project.pbxproj
+        Makefile.am
+        test.cpp
+        zip/
+            (many files)
+        unzip/
+            (many files)

tools/update_versions_v6

@@ -39,7 +39,7 @@ def xlistdir(dir):
 
 def get_api_version(exec_file):
     tmpfile = '.uvtemp'
-    cmd = "strings %s | grep API_VERSION > %s"%(exec_file, tmpfile)
+    cmd = "strings %s | egrep '^API_VERSION_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' > %s"%(exec_file, tmpfile)
     os.system(cmd)
     f = open(tmpfile, 'r')
     if (f):