Mac: update build scripts and instructions for trunk

mac_build/HowToBuildBOINC_XCode.rtf

@@ -14,7 +14,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 4/7/15\
+Last updated 4/8/15\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
 \cf0 \
 This document applies to BOINC version 7.5.0 and later.  It has instructions for building the BOINC Client and Manager for Macintosh OSX.  Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}.  \
@@ -207,7 +207,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1060\
 \f0\fs24 \cf0 \
 Important: do not change the names of any of these 6 directories.\
 \
-[3] Get the BOINC source tree from Subversion, and put it in the same BOINC_dev folder.  To do this, type the following in Terminal:\
+[3] Get the BOINC source tree from the repository, and put it in the same BOINC_dev folder.  To do this, type the following in Terminal:\
 \
 \pard\pardeftab720
 
@@ -249,6 +249,9 @@ If you don't wish to force a full rebuild of everything, omit the -clean argumen
 
 \b Note 2:
 \b0  this script tries to build all six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.39.0, openssl-1.0.1j,  freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3.  when the script finishes, it will display a warning about any libraries was unable to build (for example, if you have not downloaded them.)\
+
+\b Note 3: 
+\b0 The path must not contain any space characters.\
 \
 [5] Build BOINC as follows:\
 \

mac_build/buildfreetype.sh

@@ -25,6 +25,7 @@
 #
 # by Charlie Fenton 7/27/12
 # Updated 2/7/14 for OS 10.9
+# Updated 4/8/15 to check for spaces in path
 #
 ## This script requires OS 10.6 or later
 #
@@ -40,6 +41,23 @@
 ## the -clean argument will force a full rebuild.
 ##
 
+
+Path=$PWD
+echo "${Path}" | grep " " > /dev/null 2>&1
+if [ "$?" -eq "0" ]; then
+    echo "**********************************************************"
+    echo "**********************************************************"
+    echo "**********                                      **********"
+    echo "********** ERROR: Path must not contain spaces! **********"
+    echo "**********                                      **********"
+    echo "**********************************************************"
+    echo "**********************************************************"
+    echo "**********************************************************"
+    return 1
+fi
+
+echo ""
+
 if [ "$1" != "-clean" ]; then
     if [ -f objs/.libs/libfreetype.a ]; then
         echo "freetype-2.4.10 already built"

mac_build/setupForBOINC.sh

@@ -33,6 +33,7 @@
 # Updated 2/7/14 for wxWidgets-3.0.0
 # Updated 2/11/14 for c-ares 1.10.0, curl 7.35.0, openssl 1.0.1f, sqlite 3.8.3
 # Updated 9/2/14 for openssl 1.0.1h
+# Updated 4/8/15 for curl 7.39.0, openssl 1.0.1j
 #
 # Download these seven packages and place them in a common parent 
 # directory with the BOINC source tree.
@@ -80,13 +81,13 @@ fi
 
 echo ""
 echo "----------------------------------"
-echo "------- BUILD CURL-7.35.0 --------"
+echo "------- BUILD CURL-7.39.0 --------"
 echo "----------------------------------"
 echo ""
 
 cd "${SCRIPT_DIR}"
 
-cd ../../curl-7.35.0/
+cd ../../curl-7.39.0/
 if [  $? -eq 0 ]; then
     source "${SCRIPT_DIR}/buildcurl.sh" ${cleanit}
     if [  $? -eq 0 ]; then
@@ -96,13 +97,13 @@ fi
 
 echo ""
 echo "----------------------------------"
-echo "----- BUILD OPENSSL-1.0.1h -------"
+echo "----- BUILD OPENSSL-1.0.1j -------"
 echo "----------------------------------"
 echo ""
 
 cd "${SCRIPT_DIR}"
 
-cd ../../openssl-1.0.1h/
+cd ../../openssl-1.0.1j/
 if [  $? -eq 0 ]; then
     source "${SCRIPT_DIR}/buildopenssl.sh" ${cleanit}
     if [  $? -eq 0 ]; then
@@ -189,7 +190,7 @@ if [ "${curlOK}" = "NO" ]; then
     echo "-----------------------------------"
     echo "------------ WARNING --------------"
     echo "------------         --------------"
-    echo "--- COULD NOT BUILD CURL-7.35.0 ---"
+    echo "--- COULD NOT BUILD CURL-7.39.0 ---"
     echo "-----------------------------------"
     echo ""
 fi
@@ -199,7 +200,7 @@ if [ "${opensslOK}" = "NO" ]; then
     echo "----------------------------------"
     echo "------------ WARNING -------------"
     echo "------------         -------------"
-    echo "- COULD NOT BUILD OPENSSL-1.0.1h -"
+    echo "- COULD NOT BUILD OPENSSL-1.0.1j -"
     echo "----------------------------------"
     echo ""
 fi