From f594e1018cb3452555f2a8f76323a745d8be3ec6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 6 Jan 2016 00:41:36 -0800 Subject: [PATCH] Mac: update build scripts, Xcode project and build instructions for new third party libraries curl 7.46.0, openssl 1.0.2e, sqlite 3.9.2, FreeType-2.6.2. --- mac_build/HowToBuildBOINC_XCode.rtf | 41 +++++++++++------------ mac_build/boinc.xcodeproj/project.pbxproj | 40 ++++++++++------------ mac_build/buildcurl.sh | 8 ++--- mac_build/buildfreetype.sh | 11 +++--- mac_build/buildopenssl.sh | 7 ++-- mac_build/buildsqlite3.sh | 5 +-- mac_build/setupForBOINC.sh | 33 +++++++++--------- 7 files changed, 72 insertions(+), 73 deletions(-) diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index 8215b8195a..c9e7682a8f 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -14,10 +14,10 @@ \b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc \cf0 Written by Charlie Fenton\ -Last updated 9/11/15\ +Last updated 1/5/16\ \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}}. \ +This document applies to BOINC version 7.6.23 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}}. \ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 @@ -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 seven third-party libraries: wxWidgets-3.0.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. You can obtain the source files from the following URLs. Clicking on the first URL of each pair will download the tar file. The second URL will open the third party\'92s home web page. On Mac OS X the tar file will usually be downloaded into the Downloads folder. You will need to expand the tar files by double-clicking on them, which will create a folder and place the appropriate files into that folder. You will need to move these folders later.\ +\cf0 BOINC depends on seven third-party libraries: wxWidgets-3.0.0, c-ares-1.10.0, curl-7.46.0, openssl-1.0.2e, freetype-2.6.2, ftgl-2.1.3~rc5 and sqlite-3.9.2. You can obtain the source files from the following URLs. Clicking on the first URL of each pair will download the tar file. The second URL will open the third party\'92s home web page. On Mac OS X the tar file will usually be downloaded into the Downloads folder. You will need to expand the tar files by double-clicking on them, which will create a folder and place the appropriate files into that folder. You will need to move these folders later.\ \ wxWidgets-3.0.0 (needed only if you are building the BOINC Manager):\ {\field{\*\fldinst{HYPERLINK "http://sourceforge.net/projects/wxwindows/files/3.0.0/wxWidgets-3.0.0.tar.bz2/"}}{\fldrslt @@ -113,23 +113,23 @@ wxWidgets-3.0.0 (needed only if you are building the BOINC Manager):\ \f1\fs26 \ \f0\fs24 \ -sqlite-3.8.3 (needed only if you are building the BOINC Manager):\ +sqlite-3.9.2 (needed only if you are building the BOINC Manager):\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/2014/sqlite-autoconf-3080300.tar.gz"}}{\fldrslt -\fs26 http://www.sqlite.org/2014/sqlite-autoconf-3080300.tar.gz}} -\fs26 \ +\f1 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz"}}{\fldrslt +\fs26 http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz}} +\f0 \ -\fs24 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/"}}{\fldrslt +\f1 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/"}}{\fldrslt \fs26 http://www.sqlite.org/}} \fs26 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f0\fs24 \cf0 \ -curl-7.39.0:\ +curl-7.46.0:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.39.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.39.0.tar.gz}}\ +\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.46.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.46.0.tar.gz}}\ {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -142,22 +142,21 @@ curl-7.39.0:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f0\fs24 \cf0 openssl-1.0.1j:\ +\f0\fs24 \cf0 openssl-1.0.2e\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1j.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1j.tar.gz}}\ +\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.2e.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.2e.tar.gz}}\ {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt http://www.openssl.org/}}\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f0\fs24 \cf0 freetype-2.4.10 (needed only if you are building the BOINC default screensaver or a project screensaver):\ +\f0\fs24 \cf0 freetype-2.6.2 (needed only if you are building the BOINC default screensaver or a project screensaver):\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f3\fs22 \cf3 \CocoaLigature0 {\field{\*\fldinst{HYPERLINK "http://sourceforge.net/projects/freetype/files/freetype2/2.4.10/freetype-2.4.10.tar.bz2"}}{\fldrslt http://sourceforge.net/projects/freetype/files/freetype2/2.4.10/freetype-2.4.10.tar.bz2}} -\f0\fs24 \cf0 \CocoaLigature1 \ +\f3\fs22 \cf3 \CocoaLigature0 {\field{\*\fldinst{HYPERLINK "http://sourceforge.net/projects/freetype/files/freetype2/2.6.2/freetype-2.6.2.tar.bz2"}}{\fldrslt http://sourceforge.net/projects/freetype/files/freetype2/2.6.2/freetype-2.6.2.tar.bz2}}\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.freetype.org/"}}{\fldrslt +\f1\fs26 \cf0 \CocoaLigature1 {\field{\*\fldinst{HYPERLINK "http://www.freetype.org/"}}{\fldrslt \f3\fs22 \cf3 \CocoaLigature0 http://www.freetype.org/}} \f3\fs22 \cf3 \CocoaLigature0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -182,7 +181,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1060\ \f0\fs24 \cf0 \ \pard\pardeftab720\sa260 -\cf0 These are not done automatically by either the Xcode projects which come with wxWidgets-3.0.0, nor the AutoMake scripts supplied with wxWidgets-3.0.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. 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.0, nor the AutoMake scripts supplied with wxWidgets-3.0.0, c-ares-1.10.0, curl-7.46.0, openssl-1.0.2e, freetype-2.6.2, ftgl-2.1.3~rc5 and sqlite-3.9.2. 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] Make sure you are logged into the Mac using an account with administrator privileges. 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.\ \ @@ -192,15 +191,15 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1060\ \f1\fs26 \cf0 c-ares- \fs24 1.10.0 \fs26 \ - curl-7.39.0\ + curl-7.46.0\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \cf0 openssl-1.0.1j\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 \cf0 wxWidgets-3.0.0\ - freetype-2.4.10\ + freetype-2.6.2\ ftgl-2.1.3~rc5\ -\fs24 sqlite-3.8.3 +\fs24 sqlite-3.9.2 \fs26 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 @@ -267,7 +266,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 seven third-party libraries: wxWidgets-3.0.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 it was unable to build (for example, if you have not downloaded them.) To make it easier to find the error messages, clear the Terminal display and run the script again without +\b0 This script tries to build all seven third-party libraries: wxWidgets-3.0.0, c-ares-1.10.0, curl-7.46.0, openssl-1.0.2e, freetype-2.6.2, ftgl-2.1.3~rc5 and sqlite-3.9.2. When the script finishes, it will display a warning about any libraries it was unable to build (for example, if you have not downloaded them.) To make it easier to find the error messages, clear the Terminal display and run the script again without \f1 -clean \f0 .\ diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 380d50fa4f..45c1daf254 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3554,9 +3554,7 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Debug", - "\"$(SRCROOT)/../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Debug\"", - "../mac3rdParty/sqlite-autoconf-3080300/.libs/", - "\"$(SRCROOT)/../mac3rdParty/sqlite-autoconf-3080300/.libs\"", + "../mac3rdParty/sqlite-autoconf-3090200/.libs/", ); OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", @@ -3574,7 +3572,7 @@ "-bind_at_load", "-D_THREAD_SAFE", "-lwx_osx_cocoa_static", - "../mac3rdParty/sqlite-autoconf-3080300/.libs/libsqlite3.a", + "../mac3rdParty/sqlite-autoconf-3090200/.libs/libsqlite3.a", "-lz", "-lpthread", "-lm", @@ -3610,9 +3608,7 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Release", - "\"$(SRCROOT)/../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Release\"", - "../mac3rdParty/sqlite-autoconf-3080300/.libs/", - "\"$(SRCROOT)/../mac3rdParty/sqlite-autoconf-3080300/.libs\"", + "../mac3rdParty/sqlite-autoconf-3090200/.libs/", ); OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", @@ -3632,7 +3628,7 @@ "-bind_at_load", "-D_THREAD_SAFE", "-lwx_osx_cocoa_static", - "../mac3rdParty/sqlite-autoconf-3080300/.libs/libsqlite3.a", + "../mac3rdParty/sqlite-autoconf-3090200/.libs/libsqlite3.a", "-lz", "-lpthread", "-lm", @@ -3738,7 +3734,7 @@ HEADER_SEARCH_PATHS = ( ../api/, ../samples/jpeglib/, - "../mac3rdParty/freetype-2.4.10/include", + "../mac3rdParty/freetype-2.6.2/include", "../mac3rdParty/ftgl-2.1.3~rc5/src", ); LIBRARY_SEARCH_PATHS = ( @@ -3748,7 +3744,7 @@ OTHER_LDFLAGS = ( "-lresolv", "-ljpeg", - "../mac3rdParty/freetype-2.4.10/objs/.libs/libfreetype.a", + "../mac3rdParty/freetype-2.6.2/objs/.libs/libfreetype.a", "../mac3rdParty/ftgl-2.1.3~rc5/src/.libs/libftgl.a", "-lz", "-lbz2", @@ -3763,7 +3759,7 @@ HEADER_SEARCH_PATHS = ( ../api/, ../samples/jpeglib/, - "../mac3rdParty/freetype-2.4.10/include", + "../mac3rdParty/freetype-2.6.2/include", "../mac3rdParty/ftgl-2.1.3~rc5/src", ); LIBRARY_SEARCH_PATHS = ( @@ -3773,7 +3769,7 @@ OTHER_LDFLAGS = ( "-lresolv", "-ljpeg", - "../mac3rdParty/freetype-2.4.10/objs/.libs/libfreetype.a", + "../mac3rdParty/freetype-2.6.2/objs/.libs/libfreetype.a", "../mac3rdParty/ftgl-2.1.3~rc5/src/.libs/libftgl.a", "-lz", "-lbz2", @@ -3878,7 +3874,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; + HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.46.0/include"; INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ""; "OTHER_CFLAGS[arch=x86_64]" = ( @@ -3890,16 +3886,16 @@ ); OTHER_LDFLAGS = ( "-L.", - "../mac3rdParty/curl-7.39.0/lib/.libs/libcurl.a", + "../mac3rdParty/curl-7.46.0/lib/.libs/libcurl.a", "../mac3rdParty/c-ares-1.10.0/.libs/libcares.a", - "../mac3rdParty/openssl-1.0.1j/libcrypto.a", - "../mac3rdParty/openssl-1.0.1j/libssl.a", + "../mac3rdParty/openssl-1.0.2e/libcrypto.a", + "../mac3rdParty/openssl-1.0.2e/libssl.a", "-lldap", "-lz", ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; + USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.46.0/include"; }; name = Deployment; }; @@ -4050,7 +4046,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; + HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.46.0/include"; INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ( @@ -4061,16 +4057,16 @@ ); OTHER_LDFLAGS = ( "-L.", - "../mac3rdParty/curl-7.39.0/lib/.libs/libcurl.a", + "../mac3rdParty/curl-7.46.0/lib/.libs/libcurl.a", "../mac3rdParty/c-ares-1.10.0/.libs/libcares.a", - "../mac3rdParty/openssl-1.0.1j/libcrypto.a", - "../mac3rdParty/openssl-1.0.1j/libssl.a", + "../mac3rdParty/openssl-1.0.2e/libcrypto.a", + "../mac3rdParty/openssl-1.0.2e/libssl.a", "-lldap", "-lz", ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; + USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.46.0/include"; }; name = Development; }; diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index 4563e5df10..bb046ca2e8 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -28,16 +28,16 @@ # Updated 2/11/14 for curl 7.35.0 with c-ares 1.10.0 # Updated 9/2/14 for bulding curl as 64-bit binary # Updated 11/17/14 for curl 7.39.0 with c-ares 1.10.0 +# Updated 12/11/15 for curl 7.46.0 with c-ares 1.10.0 # ## This script requires OS 10.6 or later -## This script requires OS 10.6 or later # ## If you drag-install Xcode 4.3 or later, you must have opened Xcode ## and clicked the Install button on the dialog which appears to ## complete the Xcode installation before running this script. # -## In Terminal, CD to the curl-7.39.0 directory. -## cd [path]/curl-7.39.0/ +## In Terminal, CD to the curl-7.46.0 directory. +## cd [path]/curl-7.46.0/ ## then run this script: ## source [path]/buildcurl.sh [ -clean ] ## @@ -46,7 +46,7 @@ if [ "$1" != "-clean" ]; then if [ -f lib/.libs/libcurl.a ]; then - echo "curl-7.39.0 already built" + echo "curl-7.46.0 already built" return 0 fi fi diff --git a/mac_build/buildfreetype.sh b/mac_build/buildfreetype.sh index ff2f07f2a5..85132de2b9 100644 --- a/mac_build/buildfreetype.sh +++ b/mac_build/buildfreetype.sh @@ -19,13 +19,14 @@ # # # Script to build Macintosh Universal Intel library (i386 and x86_64) -# of FreeType-2.4.10 for use in building BOINC graphics. +# of FreeType-2.6.2 for use in building BOINC graphics. # The resulting library is at: -# [path]/freetype-2.4.10/objs/.libs/libfreetype.a +# [path]/freetype-2.6.2/objs/.libs/libfreetype.a # # by Charlie Fenton 7/27/12 # Updated 2/7/14 for OS 10.9 # Updated 4/8/15 to check for spaces in path +# Updated 1/5/16 for FreeType-2.6.2 # ## 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 freetype-2.4.10 directory. -## cd [path]/freetype-2.4.10/ +## In Terminal, CD to the freetype-2.6.2 directory. +## cd [path]/freetype-2.6.2/ ## then run this script: ## source [path]/buildfreetype.sh [ -clean ] ## @@ -60,7 +61,7 @@ echo "" if [ "$1" != "-clean" ]; then if [ -f objs/.libs/libfreetype.a ]; then - echo "freetype-2.4.10 already built" + echo "freetype-2.6.2 already built" return 0 fi fi diff --git a/mac_build/buildopenssl.sh b/mac_build/buildopenssl.sh index 669a135141..853d754cd9 100644 --- a/mac_build/buildopenssl.sh +++ b/mac_build/buildopenssl.sh @@ -29,6 +29,7 @@ # Updated 6/6/14 for openssl-1.0.1h # Updated 9/2/14 for bulding openssl as 64-bit binary # Updated 6/6/14 for openssl-1.0.1j +# Updated 12/11/15 for openssl-1.0.2e # ## This script requires OS 10.6 or later # @@ -36,8 +37,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.1j directory. -## cd [path]/openssl-1.0.1j/ +## In Terminal, CD to the openssl-1.0.2e directory. +## cd [path]/openssl-1.0.2e/ ## then run this script: ## source [path]/buildopenssl.sh [ -clean ] ## @@ -46,7 +47,7 @@ if [ "$1" != "-clean" ]; then if [ -f libssl.a ]&& [ -f libcrypto.a ]; then - echo "openssl-1.0.1j libraries already built" + echo "openssl-1.0.2e libraries already built" return 0 fi fi diff --git a/mac_build/buildsqlite3.sh b/mac_build/buildsqlite3.sh index 27cb80ad0e..16ef07627b 100644 --- a/mac_build/buildsqlite3.sh +++ b/mac_build/buildsqlite3.sh @@ -18,11 +18,12 @@ # along with BOINC. If not, see . # # -# Script to build Macintosh 32-bit Intel library of sqlite 3.8.3 for +# Script to build Macintosh 32-bit Intel library of sqlite 3.9.2 for # use in building BOINC Manager. # # by Charlie Fenton 12/11/12 # Updated 2/11/14 for sqlite 3.8.3 +# Updated 1/5/16 for sqlite 3.9.2 # ## This script requires OS 10.6 or later # @@ -40,7 +41,7 @@ if [ "$1" != "-clean" ]; then if [ -f .libs/libsqlite3.a ]; then - echo "sqlite-3.8.3 already built" + echo "sqlite-3.9.2 already built" return 0 fi fi diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh index 80cf6d72ac..acf29d9871 100644 --- a/mac_build/setupForBOINC.sh +++ b/mac_build/setupForBOINC.sh @@ -36,6 +36,7 @@ # Updated 4/8/15 for curl 7.39.0, openssl 1.0.1j # Updated 11/30/15 to allow putting third party packages in ../mac3rdParty/ # Updated 11/30/15 to return error code indicating which builds failed +# Updated 1/6/16 for curl 7.46.0, openssl 1.0.2e, sqlite 3.9.2, FreeType-2.6.2 # # Download these seven packages and place them in a common parent directory # with the BOINC source tree. For compatibility with Travis CI builds, they @@ -107,13 +108,13 @@ cd "${SCRIPT_DIR}" echo "" echo "----------------------------------" -echo "------- BUILD CURL-7.39.0 --------" +echo "------- BUILD CURL-7.46.0 --------" echo "----------------------------------" echo "" -make_symlink_if_needed curl-7.39.0 +make_symlink_if_needed curl-7.46.0 -cd ../mac3rdParty/curl-7.39.0/ +cd ../mac3rdParty/curl-7.46.0/ if [ $? -eq 0 ]; then source "${SCRIPT_DIR}/buildcurl.sh" ${cleanit} if [ $? -eq 0 ]; then @@ -125,13 +126,13 @@ cd "${SCRIPT_DIR}" echo "" echo "----------------------------------" -echo "----- BUILD OPENSSL-1.0.1j -------" +echo "----- BUILD OPENSSL-1.0.2e -------" echo "----------------------------------" echo "" -make_symlink_if_needed openssl-1.0.1j +make_symlink_if_needed openssl-1.0.2e -cd ../mac3rdParty/openssl-1.0.1j/ +cd ../mac3rdParty/openssl-1.0.2e/ if [ $? -eq 0 ]; then source "${SCRIPT_DIR}/buildopenssl.sh" ${cleanit} if [ $? -eq 0 ]; then @@ -161,13 +162,13 @@ cd "${SCRIPT_DIR}" echo "" echo "----------------------------------" -echo "------- BUILD sqlite-3.8.3 -------" +echo "------- BUILD sqlite-3.9.2 -------" echo "----------------------------------" echo "" -make_symlink_if_needed sqlite-autoconf-3080300 +make_symlink_if_needed sqlite-autoconf-3090200 -cd ../mac3rdParty/sqlite-autoconf-3080300/ +cd ../mac3rdParty/sqlite-autoconf-3090200/ if [ $? -eq 0 ]; then source "${SCRIPT_DIR}/buildsqlite3.sh" ${cleanit} if [ $? -eq 0 ]; then @@ -179,13 +180,13 @@ cd "${SCRIPT_DIR}" echo "" echo "----------------------------------" -echo "----- BUILD FreeType-2.4.10 ------" +echo "----- BUILD FreeType-2.6.2 ------" echo "----------------------------------" echo "" -make_symlink_if_needed freetype-2.4.10 +make_symlink_if_needed freetype-2.6.2 -cd ../mac3rdParty/freetype-2.4.10/ +cd ../mac3rdParty/freetype-2.6.2/ if [ $? -eq 0 ]; then source "${SCRIPT_DIR}/buildfreetype.sh" ${cleanit} if [ $? -eq 0 ]; then @@ -230,7 +231,7 @@ if [ "${curlOK}" = "NO" ]; then echo "-----------------------------------" echo "------------ WARNING --------------" echo "------------ --------------" - echo "--- COULD NOT BUILD CURL-7.39.0 ---" + echo "--- COULD NOT BUILD CURL-7.46.0 ---" echo "-----------------------------------" echo "" @@ -242,7 +243,7 @@ if [ "${opensslOK}" = "NO" ]; then echo "----------------------------------" echo "------------ WARNING -------------" echo "------------ -------------" - echo "- COULD NOT BUILD OPENSSL-1.0.1j -" + echo "- COULD NOT BUILD OPENSSL-1.0.2e -" echo "----------------------------------" echo "" @@ -266,7 +267,7 @@ if [ "${sqlite3OK}" = "NO" ]; then echo "----------------------------------" echo "------------ WARNING -------------" echo "------------ -------------" - echo "-- COULD NOT BUILD sqlite-3.8.3 --" + echo "-- COULD NOT BUILD sqlite-3.9.2 --" echo "----------------------------------" echo "" @@ -278,7 +279,7 @@ if [ "${freetypeOK}" = "NO" ]; then echo "-----------------------------------" echo "------------ WARNING --------------" echo "------------ --------------" - echo "- COULD NOT BUILD FreeType-2.4.10 -" + echo "- COULD NOT BUILD FreeType-2.6.2 -" echo "-----------------------------------" echo ""