mirror of https://github.com/BOINC/boinc.git
Revert to wxMac-2.8.0 due to bugs in later versions of wxWidgets.
svn path=/trunk/boinc/; revision=12528
This commit is contained in:
Charlie Fenton
parent
7c737343bb
commit
2b4ac75ef4
|
|
@ -4184,3 +4184,15 @@ David 1 May 2007
|
|||
Rom 30 Apr 2007 (HEAD)
|
||||
- Tag for 5.9.6 release, all platforms
|
||||
boinc_core_release_5_9_6
|
||||
|
||||
Charlie 2 May 2007
|
||||
- Mac: Revert to wxMac-2.8.0 due to bugs in later versions.
|
||||
- Mac: Update XCode project, build scripts and build instructions to use
|
||||
wxMac-2.8.0. Tag these changes for 5.9.6 release.
|
||||
|
||||
mac_build/
|
||||
buildWxMac.sh
|
||||
HowToBuildBOINC_XCode.rtf
|
||||
setupForBOINC.sh
|
||||
boinc.xcodeproj/
|
||||
project.pbxproj
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
\f1\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/27/07\
|
||||
Last updated 5/2/07\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
|
||||
\cf0 \
|
||||
This document applies to BOINC version 5.9.2 and later. It has instructions for building BOINC for Macintosh OSX, plus information for building science project applications to run under BOINC on Macintosh OSX. \
|
||||
This document applies to BOINC version 5.9.6 and later. It has instructions for building BOINC for Macintosh OSX, plus information for building science project applications to run under BOINC on Macintosh OSX. \
|
||||
\
|
||||
Note: the information in this document changes from time to time for different versions of BOINC. For any version of BOINC source files, the corresponding version of this document can be found in the source tree at:\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
|
||||
|
|
@ -104,19 +104,19 @@ After building the libraries as Universal Binaries using the second method, you
|
|||
|
||||
\f1\b0\fs24 \cf0 \
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
\cf0 BOINC depends on three third-party libraries: wxMac-2.8.3, curl-7.16.1, and jpeg-6b. You can obtain these from the following URLs:\
|
||||
\cf0 BOINC depends on three third-party libraries: wxMac-2.8.0, curl-7.16.1, and jpeg-6b. (We have reverted to using wxMac-2.8.0 because we have found several bugs in later versions of wxMac.) You can obtain these from the following URLs:\
|
||||
\
|
||||
wxMac-2.8.3 (needed only if you are building the BOINC Manager):\
|
||||
wxMac-2.8.0 (needed only if you are building the BOINC Manager):\
|
||||
{\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt
|
||||
\f2\fs26 http://www.wxwidgets.org}}
|
||||
\f2\fs26 \
|
||||
|
||||
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.3.tar.gz"}}{\fldrslt
|
||||
\f2\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.3.tar.gz}}
|
||||
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://prdownloads.sourceforge.net/wxwhttp://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz"}}{\fldrslt
|
||||
\f2\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz}}
|
||||
\f2\fs26 \
|
||||
|
||||
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://downloads.sourceforge.net/wxwindows/wxMac-2.8.3.tar.bz2"}}{\fldrslt
|
||||
\f2\fs26 http://downloads.sourceforge.net/wxwindows/wxMac-2.8.3.tar.bz2}}\
|
||||
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://downloads.sourceforge.net/wxwindows/wxMac-2.8.3.tar.bz2http://downloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.bz2"}}{\fldrslt
|
||||
\f2\fs26 http://downloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.bz2}}\
|
||||
\
|
||||
curl-7.16.1:\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
|
|
@ -157,7 +157,7 @@ XCode installed these utilities in the /usr/bin/ directory, but the upgrades by
|
|||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
\cf0 As stated above, all BOINC software for Power PC Macs must be built using GCC 3.3 and MacOS10.3.9 SDK to assure backward compatibility with OS 10.3. All BOINC software for Intel Macs must be built using GCC 4.0 and MacOS10.4.u SDK to allow cross-compiling. \
|
||||
\
|
||||
These are not done by either the XCode projects which come with wxMac-2.8.3, nor the AutoMake scripts supplied with wxMac-2.8.3, curl-7.16.1, or jpeg-6b. So be sure to use our special scripts to build these packages.\
|
||||
These are not done by either the XCode projects which come with wxMac-2.8.0, nor the AutoMake scripts supplied with wxMac-2.8.0, curl-7.16.1, or jpeg-6b. So be sure to use our special scripts to build these packages.\
|
||||
\
|
||||
Building BOINC and the library packages on which it depends requires OS 10.4.4 and XCode 2.4.1 (or greater). It may be possible to use XCode 2.3 and/or versions of OS X earlier than 10.4.4, but this has not been tested by the authors.\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
|
||||
|
|
@ -167,7 +167,7 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a
|
|||
[2] Put the following 3 directories inside the BOINC_dev folder (omit any you don't need):\
|
||||
curl-7.16.1\
|
||||
jpeg-6b\
|
||||
wxMac-2.8.3\
|
||||
wxMac-2.8.0\
|
||||
\
|
||||
Important: do not change the names of any of these 3 directories.\
|
||||
\
|
||||
|
|
@ -362,8 +362,9 @@ It is very easy to add a new platform to your server with the xadd utility. For
|
|||
{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BoincPlatforms"}}{\fldrslt
|
||||
\f2 \cf0 http://boinc.berkeley.edu/trac/wiki/BoincPlatforms}}
|
||||
\f2\fs26 \
|
||||
\pard\pardeftab720\ql\qnatural
|
||||
{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/XaddTool"}}{\fldrslt
|
||||
\fs24 http://boinc.berkeley.edu/trac/wiki/XaddTool}}
|
||||
\fs24 \cf0 http://boinc.berkeley.edu/trac/wiki/XaddTool}}
|
||||
\f1\fs24 \
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
\cf0 \
|
||||
|
|
|
|||
|
|
@ -20,14 +20,21 @@
|
|||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Script to build the wxMac-2.8.3 library for BOINC as a Universal Binary
|
||||
# Script to build the wxMac-2.8.0 library for BOINC as a Universal Binary
|
||||
#
|
||||
# by Charlie Fenton 7/21/06
|
||||
# Updated for wx-Mac 2.8.3 4/12/07
|
||||
# Updated for wx-Mac 2.8.0 5/2/07
|
||||
|
||||
#
|
||||
## In Terminal, CD to the wxMac-2.8.3 directory.
|
||||
## cd [path]/wxMac-2.8.3/
|
||||
## Before running this script, you must first copy the special XCode
|
||||
## project
|
||||
## boinc/mac_build/wxMac-BOINC.xcodeproj
|
||||
## to
|
||||
## wxMac-2.8.0/src/
|
||||
#
|
||||
#
|
||||
## In Terminal, CD to the wxMac-2.8.0 directory.
|
||||
## cd [path]/wxMac-2.8.0/
|
||||
## then run this script:
|
||||
## source [ path_to_this_script ] [ -clean ]
|
||||
##
|
||||
|
|
@ -41,10 +48,21 @@ else
|
|||
doclean=""
|
||||
fi
|
||||
|
||||
mv -n include/wx/mac/setup.h include/wx/mac/setup_obs.h
|
||||
cp -np include/wx/mac/setup0.h include/wx/mac/setup.h
|
||||
|
||||
# Create wx include directory if necessary
|
||||
if [ ! -d src/build/include/wx ]; then
|
||||
mkdir -p src/build/include/wx
|
||||
fi
|
||||
|
||||
cp -n include/wx/mac/setup0.h include/wx/setup.h
|
||||
|
||||
|
||||
if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then
|
||||
echo "Deployment libwx_mac_static.a already built"
|
||||
else
|
||||
xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk
|
||||
xcodebuild -project src/wxMac-BOINC.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk
|
||||
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
fi
|
||||
|
|
@ -52,10 +70,7 @@ fi
|
|||
if [ "$1" != "-clean" ] && [ -f src/build/Development/libwx_mac_static.a ]; then
|
||||
echo "Development libwx_mac_static.a already built"
|
||||
else
|
||||
xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk
|
||||
## The above line does Development build for only the native architecture.
|
||||
## Use line below instead for Universal Binary Development build
|
||||
## xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build ARCHS="i386 ppc" GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk
|
||||
xcodebuild -project src/wxMac-BOINC.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=3.3 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk
|
||||
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
#
|
||||
#
|
||||
# Master script to build Universal Binary libraries needed by BOINC:
|
||||
# curl-7.16.1, jpeg-6b and wxMac-2.8.3
|
||||
# curl-7.16.1, jpeg-6b and wxMac-2.8.0
|
||||
#
|
||||
# by Charlie Fenton 7/21/06
|
||||
# Updated for curl-7.16.1 and wx-Mac 2.8.3 4/12/07
|
||||
# Updated for curl-7.16.1 and wx-Mac 2.8.0 5/2/07
|
||||
#
|
||||
# Download these three packages and place them in a common parent
|
||||
# directory with the BOINC source tree.
|
||||
|
|
@ -75,13 +75,15 @@ if [ $? -ne 0 ]; then return 1; fi
|
|||
|
||||
echo ""
|
||||
echo "----------------------------------"
|
||||
echo "------- BUILD wxMac-2.8.3 --------"
|
||||
echo "------- BUILD wxMac-2.8.0 --------"
|
||||
echo "----------------------------------"
|
||||
echo ""
|
||||
|
||||
cd "${SCRIPT_DIR}"
|
||||
|
||||
cd ../../wxMac-2.8.3/
|
||||
cp -fpR wxMac-BOINC.xcodeproj ../../wxMac-2.8.0/src/
|
||||
|
||||
cd ../../wxMac-2.8.0/
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean}
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue