From 278b6931ecb3666c638c0845320c9e467352942a Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 17 Oct 2007 05:59:37 +0000 Subject: [PATCH] Mac: Update for curl_7.17.0. svn path=/trunk/boinc/; revision=13867 --- checkin_notes | 11 +++++++++ mac_build/HowToBuildBOINC_XCode.rtf | 2 +- mac_build/boinc.xcodeproj/project.pbxproj | 30 ++++++++++++++--------- mac_build/buildcurl.sh | 10 ++++---- mac_build/setupForBOINC.sh | 8 +++--- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index 3bd4d15149..6ca52dfc0b 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9597,3 +9597,14 @@ Charlie 16 Oct 2007 api/ graphics2_win.C + +Charlie 16 Oct 2007 + - Mac: Update for curl_7.17.0. + + mac_build/ + buildcurl.sh + HowToBuildBOINC_XCode.rtf + setupForBOINC.sh + boinc.xcodeproj/ + project.pbxproj + \ No newline at end of file diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index ee8174acaa..cce9f2d2a6 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -120,7 +120,7 @@ curl-7.16.1:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f2\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\ - {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.16.4.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.16.4.tar.gz}}\ + {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.17.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.17.0.tar.gz}}\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f1\fs24 \cf0 \ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index b89689429f..22f9f7eab4 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -4011,7 +4011,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; @@ -4027,9 +4027,10 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.16.1/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; @@ -4061,7 +4062,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -4075,9 +4076,10 @@ OTHER_CFLAGS_ppc = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -D_THREAD_SAFE -D__WXMAC -include ../clientgui/mac/config.h"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.16.1/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; @@ -5015,7 +5017,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.4/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -5030,9 +5032,10 @@ OTHER_CFLAGS_ppc = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -D_THREAD_SAFE -D__WXMAC -include ../clientgui/mac/config.h"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.16.4/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; @@ -5545,7 +5548,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; @@ -5562,9 +5565,10 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.16.1/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; @@ -5593,7 +5597,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.3; @@ -5607,9 +5611,10 @@ ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.16.1/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; @@ -6114,7 +6119,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.16.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.17.0/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/4.0; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -6127,9 +6132,10 @@ ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.16.1/lib/.libs/libcurl.a", + "../../curl-7.17.0/lib/.libs/libcurl.a", "-lcrypto", "-lssl", + "-lldap", "-lz", ); OTHER_REZFLAGS = ""; diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index b7cb70d960..16fb1162f5 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -20,14 +20,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # -# Script to build Macintosh Universal Binary library of curl-7.16.4 for +# Script to build Macintosh Universal Binary library of curl-7.17.0 for # use in building BOINC. # # by Charlie Fenton 7/21/06 -# Updated for curl-7.16.4 7/20/07 +# Updated for curl-7.17.0 10/16/07 # -## In Terminal, CD to the curl-7.16.4 directory. -## cd [path]/curl-7.16.4/ +## In Terminal, CD to the curl-7.17.0 directory. +## cd [path]/curl-7.17.0/ ## then run this script: ## source buildcurl.sh [ -clean ] ## @@ -37,7 +37,7 @@ if [ "$1" != "-clean" ]; then if [ -f lib/.libs/libcurl_ppc.a ] && [ -f lib/.libs/libcurl_i386.a ] && [ -f lib/.libs/libcurl.a ]; then - echo "curl-7.16.4 already built" + echo "curl-7.17.0 already built" return 0 fi fi diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh index 8911398753..733e12a404 100644 --- a/mac_build/setupForBOINC.sh +++ b/mac_build/setupForBOINC.sh @@ -21,10 +21,10 @@ # # # Master script to build Universal Binary libraries needed by BOINC: -# curl-7.16.4, jpeg-6b and wxMac-2.6.3 +# curl-7.17.0, jpeg-6b and wxMac-2.6.3 # # by Charlie Fenton 7/21/06 -# Updated for curl-7.16.4 7/20/07 +# Updated for curl-7.17.0 10/21/07 # # Download these three packages and place them in a common parent # directory with the BOINC source tree. @@ -49,13 +49,13 @@ fi echo "" echo "----------------------------------" -echo "------- BUILD CURL-7.16.4 --------" +echo "------- BUILD CURL-7.17.0 --------" echo "----------------------------------" echo "" SCRIPT_DIR=`pwd` -cd ../../curl-7.16.4/ +cd ../../curl-7.17.0/ if [ $? -ne 0 ]; then return 1; fi source "${SCRIPT_DIR}/buildcurl.sh" ${doclean} if [ $? -ne 0 ]; then return 1; fi