From 7a35b69c642677d048329c0cff56bce8627df55b Mon Sep 17 00:00:00 2001 From: Bernd Machenschalk Date: Wed, 14 Nov 2012 15:25:21 +0000 Subject: [PATCH 1/2] Limit grep operation to what's relevant and avoid accidental matches Signed-off-by: Oliver Bock --- tools/update_versions_v6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update_versions_v6 b/tools/update_versions_v6 index 80a9bf82de..13a39ea858 100755 --- a/tools/update_versions_v6 +++ b/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): From a1cb39fa55026889c7485a6dca562d68182f73ee Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Thu, 15 Nov 2012 07:15:18 -0800 Subject: [PATCH 2/2] Update boinc_zip to use current info-zip source files (info-zip 3.0 and info-unzip 6.0) --- checkin_notes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/checkin_notes b/checkin_notes index 0a686970b5..5e6dba59a6 100644 --- a/checkin_notes +++ b/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)