From 1609e03832d466ea625da129d87b565c4f90351b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 27 Feb 2008 12:01:55 +0000
Subject: [PATCH] Mac: In build scripts: fix bug, add checks for needed SDKs;
 update build documentation (from Bernd Machenschalk.)

svn path=/trunk/boinc/; revision=14808
---
 mac_build/HowToBuildBOINC_XCode.rtf |  2 +-
 mac_build/buildWxMac.sh             | 14 +++++++++++++-
 mac_build/buildc-ares.sh            | 14 +++++++++++++-
 mac_build/buildcurl.sh              | 14 +++++++++++++-
 mac_build/buildjpeg.sh              | 13 +++++++++++++
 mac_build/setupForBOINC.sh          |  4 ++--
 6 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf
index 170417afc2..a37aa6503d 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -146,7 +146,7 @@ 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}}\
+	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.18.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.18.0.tar.gz}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh
index 6ea2c170b3..328e6bee4c 100644
--- a/mac_build/buildWxMac.sh
+++ b/mac_build/buildWxMac.sh
@@ -23,7 +23,7 @@
 # Script to build the wxMac-2.8.7 library for BOINC as a Universal Binary
 #
 # by Charlie Fenton    7/21/06
-# Updated for wx-Mac 2.8.7 12/19/07
+# Updated for wx-Mac 2.8.7 2/27/08
 
 #
 ## In Terminal, CD to the wxMac-2.8.7 directory.
@@ -41,6 +41,18 @@ else
   doclean=""
 fi
 
+if [ ! -d /Developer/SDKs/MacOSX10.3.9.sdk/ ]; then
+    echo "ERROR: System 10.3.9 SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
+if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then
+    echo "ERROR: System 10.4u SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
 if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then
     echo "Deployment libwx_mac_static.a already built"
 else
diff --git a/mac_build/buildc-ares.sh b/mac_build/buildc-ares.sh
index b2a361310e..1dbe1c0cef 100644
--- a/mac_build/buildc-ares.sh
+++ b/mac_build/buildc-ares.sh
@@ -24,7 +24,7 @@
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated 1/29/08
+# Updated 2/27/08
 #
 ## In Terminal, CD to the c-ares-1.5.1 directory.
 ##     cd [path]/c-ares-1.5.1/
@@ -62,6 +62,18 @@ if [ $AlreadyBuilt -ne 0 ]; then
     return 0
 fi
 
+if [ ! -d /Developer/SDKs/MacOSX10.3.9.sdk/ ]; then
+    echo "ERROR: System 10.3.9 SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
+if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then
+    echo "ERROR: System 10.4u SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
 if [ "$1" = "-gcc33" ] || [ "$2" = "-gcc33" ]; then
     usegcc33=1
 else
diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh
index 63ff9eef2d..0795492ddd 100644
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@@ -24,7 +24,7 @@
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated 1/29/08
+# Updated 2/27/08
 #
 ## In Terminal, CD to the curl-7.18.0 directory.
 ##     cd [path]/curl-7.18.0/
@@ -68,6 +68,18 @@ else
     usegcc33=0
 fi
 
+if [ ! -d /Developer/SDKs/MacOSX10.3.9.sdk/ ]; then
+    echo "ERROR: System 10.3.9 SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
+if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then
+    echo "ERROR: System 10.4u SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
 export PATH=/usr/local/bin:$PATH
 export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
 export MACOSX_DEPLOYMENT_TARGET=10.3
diff --git a/mac_build/buildjpeg.sh b/mac_build/buildjpeg.sh
index 04217f957e..c8bcb9ae66 100644
--- a/mac_build/buildjpeg.sh
+++ b/mac_build/buildjpeg.sh
@@ -24,6 +24,7 @@
 # use in building BOINC.
 #
 # by Charlie Fenton 12/19/07
+# Updated 2/27/08
 #
 ## In Terminal, CD to the jpeg-6b directory.
 ##     cd [path]/jpeg-6b/
@@ -53,6 +54,18 @@ if [ $AlreadyBuilt -ne 0 ]; then
     return 0
 fi
 
+if [ ! -d /Developer/SDKs/MacOSX10.3.9.sdk/ ]; then
+    echo "ERROR: System 10.3.9 SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
+if [ ! -d /Developer/SDKs/MacOSX10.4u.sdk/ ]; then
+    echo "ERROR: System 10.4u SDK is missing.  For details, see build instructions at"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
+    return 1
+fi
+
 export PATH=/usr/local/bin:$PATH
 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"
diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh
index 877ca0268a..e160daf817 100644
--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@@ -25,7 +25,7 @@
 #
 # by Charlie Fenton 7/21/06
 # Bug fix for wxMac-2.6.3 7/26/07
-# Updated for curl-7.18.0, c-ares-1.5.1 and wxMac-2.8.7 1/29/08
+# Updated for curl-7.18.0, c-ares-1.5.1 and wxMac-2.8.7 2/27/08
 #
 # Download these three packages and place them in a common parent 
 # directory with the BOINC source tree.
@@ -55,7 +55,7 @@ echo "------- BUILD C-ARES-1.5.1 -------"
 echo "----------------------------------"
 echo ""
 
-cd ../../c-ares-1.15.1/
+cd ../../c-ares-1.5.1/
 if [  $? -ne 0 ]; then return 1; fi
 source "${SCRIPT_DIR}/buildc-ares.sh" ${doclean}
 if [  $? -ne 0 ]; then return 1; fi