diff --git a/checkin_notes b/checkin_notes index c1039dcf94..e5d404c8de 100644 --- a/checkin_notes +++ b/checkin_notes @@ -835,3 +835,19 @@ David Jan 28 2008 graphics2_unix.C graphics2_util.C graphics2.C + + +Charlie Jan 29 2008 + - Mac: Update libCurl to 7.18.0, build with c-ares-1.5.1 to enable + async DNS name resolving. + - Mac API: move mac_icon.C from target api_libboinc to gfx2libboinc + (link it into libboinc_graphics2.a instead of libboinc_api.a). + + mac_build/ + buildc-ares.sh (new) + buildcurl.sh + HowToBuildBOINC_XCode.rtf + setupForBOINC.sh + boinc.xcodeproj/ + project.pbxproj + diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index 40eb2865af..eea973511e 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -11,7 +11,7 @@ \b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc \cf0 Written by Charlie Fenton\ -Last updated 1/10/08\ +Last updated 1/29/08\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \cf0 \ This document applies to BOINC version 6.1.0 and later. It has instructions for building BOINC for Macintosh OSX, plus information for building science project applications to run under BOINC on Macintosh OSX. \ @@ -130,7 +130,7 @@ If you prefer, you can cross-compile on one Mac running OS 10.4.x or OS 10.5.x. \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.8.7, curl-7.17.1, and jpeg-6b. You can obtain these from the following URLs:\ +\cf0 BOINC depends on four third-party libraries: wxMac-2.8.7, c-ares-1.5.1, curl-7.18.0, and jpeg-6b. You can obtain these from the following URLs:\ \ wxMac-2.8.7 (needed only if you are building the BOINC Manager):\ {\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt @@ -142,11 +142,19 @@ wxMac-2.8.7 (needed only if you are building the BOINC Manager):\ \f1\fs26 \ \f0\fs24 \ -curl-7.17.1:\ +curl-7.18.0:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\ {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.17.1.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.17.1.tar.gz}}\ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural + +\f0\fs24 \cf0 c-ares-1.5.1 (used by curl):\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural + +\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://daniel.haxx.se/projects/c-ares/"}}{\fldrslt http://daniel.haxx.se/projects/c-ares/}}\ + {\field{\*\fldinst{HYPERLINK "http://daniel.haxx.se/projects/c-ares/c-ares-1.5.1.tar.gz"}}{\fldrslt http://daniel.haxx.se/projects/c-ares/c-ares-1.5.1.tar.gz}}\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \f0\fs24 \cf0 \ @@ -164,7 +172,9 @@ jpeg-6b (needed only if you are building the BOINC libboinc_graphics_api.a libr \i0 \i XCode 3.0 installs autoconf 2.61 and automake 1.10. \i0 -\i To determine the version number, type "autoconf --version" or "automake --version" . Building curl-7.17.1 require autoconf 2.59 and automake 1.9.3 or later. \ +\i To determine the version number, type "autoconf --version" or "automake --version" . Building curl- +\i0 7.18.0 +\i requires autoconf 2.59 and automake 1.9.3 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 @@ -183,7 +193,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 MacOS10.3.9 SDK and (for libraries) GCC 3.3 to assure backward compatibility with OS 10.3. All 32-bit BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.4.u SDK to allow cross-compiling. And all 64-bit BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.5 SDK. \ \ -These are not done by either the XCode projects which come with wxMac-2.8.7, nor the AutoMake scripts supplied with wxMac-2.8.7, curl-7.17.1, 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.8.7, nor the AutoMake scripts supplied with wxMac-2.8.7, c-ares-1.5.1, curl-7.18.0, 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 (or later) and XCode 2.4.1 (or later). It may be possible to use XCode 2.3 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 @@ -191,7 +201,9 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 ( [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.17.1\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural +\cf0 c-ares-1.5.1\ + curl-7.18.0\ jpeg-6b\ wxMac-2.8.7\ \ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index e4b1676541..0c523632da 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -176,9 +176,9 @@ DD52C81408B5D484008D9AA4 /* network.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.C */; }; DD531BC60C193D3800742E50 /* MacInstaller.icns in Resources */ = {isa = PBXBuildFile; fileRef = DD531BC50C193D3800742E50 /* MacInstaller.icns */; }; DD531BC80C193D5200742E50 /* MacUninstaller.icns in Resources */ = {isa = PBXBuildFile; fileRef = DD531BC70C193D5200742E50 /* MacUninstaller.icns */; }; + DD5BF77D0D4F3D0C00EDF980 /* mac_icon.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6381450870DB78007A2F8E /* mac_icon.C */; }; DD616A3008150050006981C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; }; DD635A420D384FA500BAC1A5 /* texfont.C in Sources */ = {isa = PBXBuildFile; fileRef = DD635A410D384FA500BAC1A5 /* texfont.C */; }; - DD6381460870DB78007A2F8E /* mac_icon.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6381450870DB78007A2F8E /* mac_icon.C */; }; DD6381F90870DD83007A2F8E /* make_app_icon_h.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6381F80870DD83007A2F8E /* make_app_icon_h.C */; }; DD63F7510B64EECE0053037F /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA90F260B64673D008F2E87 /* libwx_mac_static.a */; }; DD6617880A3FFD8C00FFEBEB /* check_security.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6617870A3FFD8C00FFEBEB /* check_security.C */; }; @@ -2116,7 +2116,6 @@ buildActionMask = 2147483647; files = ( DD35353607E1E13F00C4718D /* boinc_api.C in Sources */, - DD6381460870DB78007A2F8E /* mac_icon.C in Sources */, DDE41C260C1FCA8F00CA1F86 /* graphics2_util.C in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2359,6 +2358,7 @@ DDB873F60C850BC800E0DE1F /* txf_util.C in Sources */, DDB873F70C850BC800E0DE1F /* str_util.C in Sources */, DD635A420D384FA500BAC1A5 /* texfont.C in Sources */, + DD5BF77D0D4F3D0C00EDF980 /* mac_icon.C in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3023,7 +3023,8 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -3042,7 +3043,8 @@ ); HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -3575,7 +3577,8 @@ buildSettings = { HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -3865,9 +3868,10 @@ ppc, x86_64, ); - HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; + HEADER_SEARCH_PATHS = "../../curl-7.18.0/include"; OTHER_LDFLAGS = ( - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -4119,7 +4123,8 @@ OTHER_LDFLAGS = ( "-framework", Security, - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -4135,7 +4140,8 @@ ARCHS = ppc; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", @@ -4435,7 +4441,8 @@ ARCHS = i386; HEADER_SEARCH_PATHS = "../../curl-7.17.1/include"; OTHER_LDFLAGS = ( - "../../curl-7.17.1/lib/.libs/libcurl.a", + "../../curl-7.18.0/lib/.libs/libcurl.a", + "../../c-ares-1.5.1/.libs/libcares.a", "-lcrypto", "-lssl", "-lldap", diff --git a/mac_build/buildc-ares.sh b/mac_build/buildc-ares.sh new file mode 100644 index 0000000000..b2a361310e --- /dev/null +++ b/mac_build/buildc-ares.sh @@ -0,0 +1,174 @@ +#!/bin/sh + +# Berkeley Open Infrastructure for Network Computing +# http://boinc.berkeley.edu +# Copyright (C) 2005 University of California +# +# This is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; +# either version 2.1 of the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU Lesser General Public License for more details. +# +# To view the GNU Lesser General Public License visit +# http://www.gnu.org/copyleft/lesser.html +# or write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# +# Script to build Macintosh Universal Binary library of c-ares-1.5.1 for +# use in building BOINC. +# +# by Charlie Fenton 7/21/06 +# Updated 1/29/08 +# +## In Terminal, CD to the c-ares-1.5.1 directory. +## cd [path]/c-ares-1.5.1/ +## then run this script: +## source [path]/buildc-ares.sh [ -clean ] [ -gcc33 ] +## +## the -clean argument will force a full rebuild. +## +## the -gcc33 argument will cause the PowerPC build to use gcc-3.3 +## otherwise both architectures will be built using gcc_4.0 +## +## Use -gcc33 if you need to link with a project application using BOINC +## libraries built with gcc-3.3 for backward compatibility to OS 10.3.0 +## +## Build with gcc-4.0 to link with the BOINC client +# + +AlreadyBuilt=0 + +if [ "$1" != "-clean" ]; then + if [ -f .libs/libcares_ppc.a ] && [ -f .libs/libcares_i386.a ] && [ -f .libs/libcares.a ]; then + AlreadyBuilt=1 + fi +fi + + if [ -d /Developer/SDKs/MacOSX10.5.sdk/ ]; then + # Build for x86_64 architecture if OS 10.5 SDK is present + if [ ! -f .libs/libcares_x86_64.a ]; then + AlreadyBuilt=0 + fi +fi + +if [ $AlreadyBuilt -ne 0 ]; then + echo "c-ares-1.5.1 already built" + return 0 +fi + +if [ "$1" = "-gcc33" ] || [ "$2" = "-gcc33" ]; then + usegcc33=1 +else + usegcc33=0 +fi + +export PATH=/usr/local/bin:$PATH +export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" +export MACOSX_DEPLOYMENT_TARGET=10.3 + +rm -f .libs/libcares.a +rm -f .libs/libcares_ppc.a +rm -f .libs/libcares_i386.a +rm -f .libs/libcares_x86_64.a + +if [ $usegcc33 -ne 0 ]; then + +export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" +export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" + +./configure --enable-shared=NO --host=ppc +if [ $? -ne 0 ]; then return 1; fi + +else + +export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" + +./configure --enable-shared=NO --host=ppc +fi + +if [ $? -ne 0 ]; then return 1; fi + + +make clean + +make +if [ $? -ne 0 ]; then return 1; fi +mv -f .libs/libcares.a libcares_ppc.a + +make clean +if [ $? -ne 0 ]; then return 1; fi + +##export PATH=/usr/local/bin:$PATH +export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" +export MACOSX_DEPLOYMENT_TARGET=10.4 + +./configure --enable-shared=NO --host=i386 +if [ $? -ne 0 ]; then return 1; fi + +make +if [ $? -ne 0 ]; then return 1; fi + +export CC="";export CXX="" +export LDFLAGS="" +export CPPFLAGS="" +export CFLAGS="" +export SDKROOT="" + +if [ ! -d /Developer/SDKs/MacOSX10.5.sdk/ ]; then + mv -f .libs/libcares.a .libs/libcares_i386.a + mv -f libcares_ppc.a .libs/ + lipo -create .libs/libcares_i386.a .libs/libcares_ppc.a -output .libs/libcares.a + if [ $? -ne 0 ]; then return 1; fi + return 0 +fi + + +# Build for x86_64 architecture if OS 10.5 SDK is present + +mv -f .libs/libcares.a libcares_i386.a + +make clean +if [ $? -ne 0 ]; then return 1; fi + +##export PATH=/usr/local/bin:$PATH +export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" +export MACOSX_DEPLOYMENT_TARGET=10.5 + +./configure --enable-shared=NO --host=x86_64 --without-random CFLAGS="-arch x86_64" +if [ $? -ne 0 ]; then return 1; fi + +make +if [ $? -ne 0 ]; then return 1; fi + +export CC="";export CXX="" +export LDFLAGS="" +export CPPFLAGS="" +export CFLAGS="" +export SDKROOT="" + +mv -f .libs/libcares.a .libs/libcares_x86_64.a +mv -f libcares_ppc.a .libs/ +mv -f libcares_i386.a .libs/ +lipo -create .libs/libcares_i386.a .libs/libcares_x86_64.a .libs/libcares_ppc.a -output .libs/libcares.a +if [ $? -ne 0 ]; then return 1; fi + +return 0 diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index 54ed77165a..63ff9eef2d 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.17.1 for +# Script to build Macintosh Universal Binary library of curl-7.18.0 for # use in building BOINC. # # by Charlie Fenton 7/21/06 -# Updated 12/19/07 +# Updated 1/29/08 # -## In Terminal, CD to the curl-7.17.1 directory. -## cd [path]/curl-7.17.1/ +## In Terminal, CD to the curl-7.18.0 directory. +## cd [path]/curl-7.18.0/ ## then run this script: ## source [path]/buildcurl.sh [ -clean ] [ -gcc33 ] ## @@ -58,7 +58,7 @@ fi fi if [ $AlreadyBuilt -ne 0 ]; then - echo "curl-7.17.1 already built" + echo "curl-7.18.0 already built" return 0 fi @@ -80,25 +80,22 @@ rm -f lib/.libs/libcurl_x86_64.a if [ $usegcc33 -ne 0 ]; then export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 -export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" -export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" -export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" - -./configure --enable-shared=NO --host=ppc -if [ $? -ne 0 ]; then return 1; fi +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" +export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export CFLAGS="-arch ppc -D_NONSTD_SOURCE -I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isystem /Developer/SDKs/MacOSX10.3.9.sdk" else export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export LDFLAGS=" -L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" -./configure --enable-shared=NO --host=ppc fi -if [ $? -ne 0 ]; then return 1; fi +./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=ppc +if [ $? -ne 0 ]; then return 1; fi make clean @@ -111,13 +108,13 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export LDFLAGS="-L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" export MACOSX_DEPLOYMENT_TARGET=10.4 -./configure --enable-shared=NO --host=i386 +./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=i386 if [ $? -ne 0 ]; then return 1; fi make @@ -147,13 +144,13 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" -export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" -export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export LDFLAGS="-L../c-ares-1.5.1/.libs -L../../c-ares-1.5.1/.libs -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CPPFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export CFLAGS="-I../c-ares-1.5.1 -I../../c-ares-1.5.1 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" export MACOSX_DEPLOYMENT_TARGET=10.5 -./configure --enable-shared=NO --host=x86_64 --without-random CFLAGS="-arch x86_64" +./configure --enable-shared=NO --enable-ares=../c-ares-1.5.1 --host=x86_64 --without-random CFLAGS="-arch x86_64" if [ $? -ne 0 ]; then return 1; fi make diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh index 4ca9174f89..877ca0268a 100644 --- a/mac_build/setupForBOINC.sh +++ b/mac_build/setupForBOINC.sh @@ -21,11 +21,11 @@ # # # Master script to build Universal Binary libraries needed by BOINC: -# curl-7.17.1, jpeg-6b and wxMac-2.6.3 +# curl-7.18.0 with c-ares-1.5.1, jpeg-6b and wxMac-2.8.7 # # by Charlie Fenton 7/21/06 # Bug fix for wxMac-2.6.3 7/26/07 -# Updated for curl-7.17.1 11/13/07 +# Updated for curl-7.18.0, c-ares-1.5.1 and wxMac-2.8.7 1/29/08 # # Download these three packages and place them in a common parent # directory with the BOINC source tree. @@ -47,16 +47,28 @@ else doclean="" fi - -echo "" -echo "----------------------------------" -echo "------- BUILD CURL-7.17.1 --------" -echo "----------------------------------" -echo "" - SCRIPT_DIR=`pwd` -cd ../../curl-7.17.1/ +echo "" +echo "----------------------------------" +echo "------- BUILD C-ARES-1.5.1 -------" +echo "----------------------------------" +echo "" + +cd ../../c-ares-1.15.1/ +if [ $? -ne 0 ]; then return 1; fi +source "${SCRIPT_DIR}/buildc-ares.sh" ${doclean} +if [ $? -ne 0 ]; then return 1; fi + +echo "" +echo "----------------------------------" +echo "------- BUILD CURL-7.18.0 --------" +echo "----------------------------------" +echo "" + +cd "${SCRIPT_DIR}" + +cd ../../curl-7.18.0/ if [ $? -ne 0 ]; then return 1; fi source "${SCRIPT_DIR}/buildcurl.sh" ${doclean} if [ $? -ne 0 ]; then return 1; fi @@ -76,13 +88,13 @@ if [ $? -ne 0 ]; then return 1; fi echo "" echo "----------------------------------" -echo "------- BUILD wxMac-2.6.3 --------" +echo "------- BUILD wxMac-2.8.7 --------" echo "----------------------------------" echo "" cd "${SCRIPT_DIR}" -cd ../../wxMac-2.6.3/ +cd ../../wxMac-2.8.7/ if [ $? -ne 0 ]; then return 1; fi source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean} if [ $? -ne 0 ]; then return 1; fi