From 1aed0d60f25e84edaabaaf4a50b3765a16efc371 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 27 Jul 2012 12:29:16 +0000
Subject: [PATCH] Mac: create build scripts for FreeType-2.4.10 and
 FTGL-2.1.3-rc5 libraries

svn path=/trunk/boinc/; revision=25900
---
 checkin_notes              |  4 +-
 mac_build/buildFTGL.sh     |  4 +-
 mac_build/buildWxMac.sh    |  4 +-
 mac_build/buildfreetype.sh |  2 +-
 mac_build/setupForBOINC.sh | 78 ++++++++++++++++++++++++++++++++++++--
 5 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 3e9ad593c9..72209e850d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5081,8 +5081,10 @@ Charlie 26 July 2012
 
 Charlie 27 July 2012
     - Mac: create build scripts for FreeType-2.4.10 and FTGL-2.1.3-rc5 
-        libraries.
+        libraries; eliminate extra output from wxMac build script.
     
      mac_build/
         buildfreetype.sh
         buildFTGL.sh
+        buildWxMac.sh
+        setupforBOINC.sh
diff --git a/mac_build/buildFTGL.sh b/mac_build/buildFTGL.sh
index 8015604a83..ea82eb7223 100644
--- a/mac_build/buildFTGL.sh
+++ b/mac_build/buildFTGL.sh
@@ -33,13 +33,13 @@
 ## In Terminal, CD to the ftgl-2.1.3~rc5 directory.
 ##     cd [path]/ftgl-2.1.3~rc5/
 ## then run this script:
-##     source [path]/buildfreetype.sh [ -clean ]
+##     source [path]/buildFTGL.sh [ -clean ]
 ##
 ## the -clean argument will force a full rebuild.
 ##
 
 if [ "$1" != "-clean" ]; then
-    if [ -f .libs/libftgl.a ]; then
+    if [ -f src/.libs/libftgl.a ]; then
         echo "ftgl-2.1.3~rc5 already built"
         return 0
     fi
diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh
index d0d159b5a6..c6ffa8137c 100644
--- a/mac_build/buildWxMac.sh
+++ b/mac_build/buildWxMac.sh
@@ -23,7 +23,7 @@
 # by Charlie Fenton    7/21/06
 # Updated for wx-Mac 2.8.10 and Unicode 4/17/09
 # Updated for OS 10.7 and XCode 4.1 with OS 10.4 compatibility 9/26/11
-# Updated for partial OS 10.8 and XCode 4.5 compatibility 7/6/12
+# Updated for partial OS 10.8 and XCode 4.5 compatibility 7/27/12
 ## NOTE: To run with XCode 4.5, you must first obtain a copy of the 
 ##  MacOSX10.6.sdk and copy it into the folder: 
 ##  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
@@ -58,7 +58,7 @@ else
   doclean=""
 fi
 
-xcodebuild -version -sdk macosx10.6
+xcodebuild -version -sdk macosx10.6 > /dev/null
 if [ ! "$?" = "0" ]; then
     echo "ERROR: System 10.6 SDK is missing.  For details, see build instructions at"
     echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or http://boinc.berkeley.edu/trac/wiki/MacBuild"
diff --git a/mac_build/buildfreetype.sh b/mac_build/buildfreetype.sh
index a02f59549f..ee6a271d55 100644
--- a/mac_build/buildfreetype.sh
+++ b/mac_build/buildfreetype.sh
@@ -92,7 +92,7 @@ export CFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=10
 export SDKROOT="${SDKPATH}"
 export MACOSX_DEPLOYMENT_TARGET=10.4
 
-./configure --enable-shared=PKGS --host=i386
+./configure --enable-shared=NO --host=i386
 if [  $? -ne 0 ]; then return 1; fi
 
 if [ "$1" = "-clean" ]; then
diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh
index 48cbbaa6eb..5d564c7f79 100644
--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@@ -26,6 +26,7 @@
 # Updated 7/6/11 for wxMac-2.8.10 and Unicode
 # Updated 6/25/12 for curl-7.26.0 and c-ares-1.9.1
 # Updated 6/26/12 for openssl-1.0.1c
+# Updated 7/27/12 for FreeType-2.4.10 and FTGL-2.1.3~rc5
 #
 # Download these three packages and place them in a common parent 
 # directory with the BOINC source tree.
@@ -47,6 +48,10 @@ else
   doclean=""
 fi
 
+wxWidgetsOK="NO"
+freetypeOK="NO"
+ftglOK="NO"
+
 SCRIPT_DIR=`pwd`
 
 echo ""
@@ -88,16 +93,81 @@ if [  $? -ne 0 ]; then return 1; fi
 
 echo ""
 echo "----------------------------------"
-echo "------- BUILD wxMac-2.8.10 --------"
+echo "------- BUILD wxMac-2.8.10 -------"
 echo "----------------------------------"
 echo ""
 
 cd "${SCRIPT_DIR}"
 
 cd ../../wxMac-2.8.10/
-if [  $? -ne 0 ]; then return 1; fi
-source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean}
-if [  $? -ne 0 ]; then return 1; fi
+if [  $? -eq 0 ]; then
+    source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean}
+    if [  $? -eq 0 ]; then
+        wxWidgetsOK="YES"
+    fi
+fi
+
+if [ "${wxWidgetsOK}" = "NO" ]; then
+    echo ""
+    echo "----------------------------------"
+    echo "------------ WARNING -------------"
+    echo "-- COULD NOT BUILD wxMac-2.8.10 --"
+    echo "----------------------------------"
+    echo ""
+fi
+
+
+echo ""
+echo "----------------------------------"
+echo "----- BUILD FreeType-2.4.10 ------"
+echo "----------------------------------"
+echo ""
 
 cd "${SCRIPT_DIR}"
+
+cd ../../freetype-2.4.10/
+if [  $? -eq 0 ]; then
+    source "${SCRIPT_DIR}/buildfreetype.sh" ${doclean}
+    if [  $? -eq 0 ]; then
+        freetypeOK="YES"
+    fi
+fi
+
+if [ "${freetypeOK}" = "NO" ]; then
+    echo ""
+    echo "-----------------------------------"
+    echo "------------ WARNING --------------"
+    echo "- COULD NOT BUILD FreeType-2.4.10 -"
+    echo "-----------------------------------"
+    echo ""
+fi
+
+echo ""
+echo "----------------------------------"
+echo "------ BUILD FTGL-2.1.3~rc5 ------"
+echo "----------------------------------"
+echo ""
+
+cd "${SCRIPT_DIR}"
+
+cd ../../ftgl-2.1.3~rc5/
+if [  $? -eq 0 ]; then
+    source "${SCRIPT_DIR}/buildFTGL.sh" ${doclean}
+    if [  $? -eq 0 ]; then
+        ftglOK="YES"
+    fi
+fi
+
+if [ "{$ftglOK}" = "NO" ]; then
+    echo ""
+    echo "-----------------------------------"
+    echo "------------ WARNING --------------"
+    echo "- COULD NOT BUILD FTGL-2.1.3~rc50 -"
+    echo "-----------------------------------"
+    echo ""
+fi
+
+echo ""
+cd "${SCRIPT_DIR}"
+
 return 0