From e23df36935f58db1e84fa496ada5b74a5157e7a6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 3 Oct 2006 01:11:52 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11232 --- checkin_notes | 9 +++++++++ mac_build/HowToBuildBOINC_XCode.rtf | 12 ++++++------ mac_build/boinc.xcodeproj/project.pbxproj | 24 +++++++++++------------ mac_build/buildcurl.sh | 8 ++++---- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index 11ecd487f2..95431f6d0e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10671,3 +10671,12 @@ David 2 Oct 2006 prefs.C,h procinfo.h procinfo_win.C + +Charlie 2 Oct 2006 + - Mac: Changes for libcurl 7.15.5. + + mac_build/ + buildcurl.sh + HowToBuildBOINC_XCode.rtf + boinc.xcodeproj/ + project.pbxproj diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index be50e5b071..b2ffc029be 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -84,7 +84,7 @@ After building the libraries as Universal Binaries using the second method, you \f1\b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural -\cf0 BOINC depends on three third-party libraries: wxMac-2.6.3, curl-7.15.3, and jpeg-6b. You can obtain these from the following URLs:\ +\cf0 BOINC depends on three third-party libraries: wxMac-2.6.3, curl-7.5.15, and jpeg-6b. You can obtain these from the following URLs:\ \ wxMac-2.6.3 (needed only if you are building the BOINC Manager):\ {\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt @@ -94,11 +94,11 @@ wxMac-2.6.3 (needed only if you are building the BOINC Manager):\ \f1\fs24 {\field{\*\fldinst{HYPERLINK "http://prdownloads.sourceforge.net/wxwindows/wxMac-2.6.3.tar.gz"}}{\fldrslt \f3\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.6.3.tar.gz}}\ \ -curl-7.15.3:\ +curl-7.5.15:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f3\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\ - {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.15.3.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.15.3.tar.gz}}\ + {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.15.3.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.5.15.tar.gz}}\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f1\fs24 \cf0 \ @@ -114,7 +114,7 @@ jpeg-6b (needed only if you are building the BOINC libboinc_graphics_api.a libr \f2\i \cf0 XCode 2.2 installs autoconf 2.59 and automake 1.63. \f1\i0 -\f2\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.6.3 and curl-7.15.3 require autoconf 2.59 and automake 1.93 or later. \ +\f2\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.6.3 and curl-7.5.15 require autoconf 2.59 and automake 1.93 or later. \ \ Upgrades for autoconf and automake are available from www.gnu.org: \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural @@ -133,7 +133,7 @@ XCode installed these utilities in the /usr/bin/ directory, but the upgrades by \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \cf0 As stated above, all BOINC software for Power PC Macs must be built using GCC 3.3 and MacOS10.3.9 SDK to assure backward compatibility with OS 10.3. All BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.4.u SDK to allow cross-compiling. \ \ -These are not done by either the XCode projects which come with wxMac-2.6.3, nor the AutoMake scripts supplied with wxMac-2.6.3, curl-7.15.3, or jpeg-6b. So be sure to use our special scripts to build these packages.\ +These are not done by either the XCode projects which come with wxMac-2.6.3, nor the AutoMake scripts supplied with wxMac-2.6.3, curl-7.5.15, or jpeg-6b. So be sure to use our special scripts to build these packages.\ \ Building BOINC and the library packages on which it depends requires OS 10.4.4 and XCode 2.2 (or greater). It may be possible to use XCode 2.1 and/or versions of OS X earlier than 10.4.4, but this has not been tested by the authors.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural @@ -141,7 +141,7 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a [1] Create a parent directory within which to work. In this description , we will call it BOINC_dev, but you can name it anything you wish.\ \ [2] Put the following 3 directories inside the BOINC_dev folder (omit any you don't need):\ - curl-7.15.3\ + curl-7.5.15\ jpeg-6b\ wxMac-2.6.3\ \ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 04021e5800..d381b14c6e 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3728,7 +3728,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; @@ -3744,7 +3744,7 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", @@ -3778,7 +3778,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -3791,7 +3791,7 @@ 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.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", @@ -4814,7 +4814,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -4828,7 +4828,7 @@ 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.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", @@ -5406,7 +5406,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; @@ -5423,7 +5423,7 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", @@ -5454,7 +5454,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3; MACOSX_DEPLOYMENT_TARGET = 10.3; @@ -5468,7 +5468,7 @@ ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", @@ -6096,7 +6096,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = "../../curl-7.15.3/include"; + HEADER_SEARCH_PATHS = "../../curl-7.15.5/include"; INSTALL_PATH = ""; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/4.0; MACOSX_DEPLOYMENT_TARGET = 10.4; @@ -6108,7 +6108,7 @@ ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( - "../../curl-7.15.3/lib/.libs/libcurl.a", + "../../curl-7.15.5/lib/.libs/libcurl.a", "-lcrypto", "-lssl", "-lz", diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index b3ad57720c..d50206c57d 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -20,13 +20,13 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Script to build Macintosh Universal Binary library of curl-7.15.3 for +# Script to build Macintosh Universal Binary library of curl-7.15.5 for # use in building BOINC. # # by Charlie Fenton 7/21/06 # -## In Terminal, CD to the curl-7.15.3 directory. -## cd [path]/curl-7.15.3/ +## In Terminal, CD to the curl-7.15.5 directory. +## cd [path]/curl-7.15.5/ ## then run this script: ## source buildcurl [ -clean ] ## @@ -36,7 +36,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.15.3 already built" + echo "curl-7.15.5 already built" return 0 fi fi