From 8ef2d061b8d9236952d780ae0501d98b8d6a77c6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 6 Jun 2014 17:09:32 -0700 Subject: [PATCH] client: Update Mad build script, Xcode project and build instructions to use OpenSSL-1.0.1h. --- mac_build/HowToBuildBOINC_XCode.rtf | 14 +++++++------- mac_build/boinc.xcodeproj/project.pbxproj | 8 ++++---- mac_build/buildopenssl.sh | 7 ++++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index aaa6b1fbda..7f26b865ca 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/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/14/14\ +Last updated 6/6/14\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 \ This document applies to BOINC version 7.3.16 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}}. \ @@ -101,7 +101,7 @@ You get these tools, including the GCC compilers and system library header files Note: building BOINC Manager 7.3.0 and later requires the OS 10.8 SDK or later.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 BOINC depends on six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1g, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. You can obtain the source files from the following URLs:\ +\cf0 BOINC depends on six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1h, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. You can obtain the source files from the following URLs:\ \ wxWidgets-3.0 (needed only if you are building the BOINC Manager):\ {\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt @@ -142,11 +142,11 @@ curl-7.35.0:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f0\fs24 \cf0 openssl-1.0.1g:\ +\f0\fs24 \cf0 openssl-1.0.1h:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt http://www.openssl.org/}}\ - {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1g.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1g.tar.gz}}\ + {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1h.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1h.tar.gz}}\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -182,7 +182,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1050\ \f0\fs24 \cf0 \ \pard\pardeftab720\sa260 -\cf0 These are not done automatically by either the Xcode projects which come with wxWidgets-3.0, nor the AutoMake scripts supplied with wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1g, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. So be sure to use our special scripts to build these packages.\ +\cf0 These are not done automatically by either the Xcode projects which come with wxWidgets-3.0, nor the AutoMake scripts supplied with wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1h, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. So be sure to use our special scripts to build these packages.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 [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.\ \ @@ -194,7 +194,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1050\ \fs26 \ curl-7.35.0\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 openssl-1.0.1g\ +\cf0 openssl-1.0.1h\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 wxWidgets-3.0\ freetype-2.4.10\ @@ -248,7 +248,7 @@ If you don't wish to force a full rebuild of everything, omit the -clean argumen \f0\fs24 command to run them.\ \b Note 2: -\b0 this script tries to build all six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1g, 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.)\ +\b0 this script tries to build all six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1h, 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.)\ \ [5] Build BOINC as follows:\ \ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 2a287aa834..5d32930673 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3888,8 +3888,8 @@ "-L.", "../../curl-7.35.0/lib/.libs/libcurl.a", "../../c-ares-1.10.0/.libs/libcares.a", - "../../openssl-1.0.1g/libcrypto.a", - "../../openssl-1.0.1g/libssl.a", + "../../openssl-1.0.1h/libcrypto.a", + "../../openssl-1.0.1h/libssl.a", "-lldap", "-lz", ); @@ -4054,8 +4054,8 @@ "-L.", "../../curl-7.35.0/lib/.libs/libcurl.a", "../../c-ares-1.10.0/.libs/libcares.a", - "../../openssl-1.0.1g/libcrypto.a", - "../../openssl-1.0.1g/libssl.a", + "../../openssl-1.0.1h/libcrypto.a", + "../../openssl-1.0.1h/libssl.a", "-lldap", "-lz", ); diff --git a/mac_build/buildopenssl.sh b/mac_build/buildopenssl.sh index f254dbdfc3..9011c13253 100644 --- a/mac_build/buildopenssl.sh +++ b/mac_build/buildopenssl.sh @@ -26,6 +26,7 @@ # Updated 7/30/13 for openssl-1.0.1e # Updated 2/12/14 for openssl-1.0.1f # Updated 4/14/14 for openssl-1.0.1g +# Updated 6/6/14 for openssl-1.0.1h # ## This script requires OS 10.6 or later # @@ -33,8 +34,8 @@ ## and clicked the Install button on the dialog which appears to ## complete the Xcode installation before running this script. # -## In Terminal, CD to the openssl-1.0.1g directory. -## cd [path]/openssl-1.0.1g/ +## In Terminal, CD to the openssl-1.0.1h directory. +## cd [path]/openssl-1.0.1h/ ## then run this script: ## source [path]/buildopenssl.sh [ -clean ] ## @@ -43,7 +44,7 @@ if [ "$1" != "-clean" ]; then if [ -f libssl.a ]&& [ -f libcrypto.a ]; then - echo "openssl-1.0.1g libraries already built" + echo "openssl-1.0.1h libraries already built" return 0 fi fi