mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=10038
This commit is contained in:
Charlie Fenton
parent
90cefd5274
commit
53d186f1d1
|
|
@ -4206,3 +4206,17 @@ Walt 26 Apr 2006
|
|||
|
||||
lib/
|
||||
gui_rpc_client.h
|
||||
|
||||
Charlie 27 Apr 06
|
||||
-Mac: Change XCode project. build instructions and build scripts to use
|
||||
curl-7.15.3 and to apply Walt's patch to curl-7.15.3/lib/url.c file.
|
||||
|
||||
doc/
|
||||
mac_build.html
|
||||
mac_build/
|
||||
buildcurl.sh
|
||||
buildjpeg.sh
|
||||
setupForBOINC.sh
|
||||
HowToBuildBOINC_XCode.rtf
|
||||
boinc.xcodeproj/
|
||||
project.pbxproj
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ $mac_changes_54= "
|
|||
select the Projects tab, select each project and press the Update button.
|
||||
Then select the Tasks tab and make sure there are no tasks \"Ready to report.\"
|
||||
<li> We are now building with newer tools and libraries: XCode 2.2,
|
||||
WxWidgets 2.6.2, libcurl 7.15.1.
|
||||
WxWidgets 2.6.2, libcurl 7.15.3.
|
||||
<li> Only administrators can attach to a new project
|
||||
(for improved security).
|
||||
<li> No longer crashes if there is a space character
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ 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.6.2, curl-7.15.1, and jpeg-6b. You can obtain these from the following URLs:\
|
||||
\cf0 BOINC depends on three third-party libraries: wxMac-2.6.2, curl-7.15.3, and jpeg-6b. You can obtain these from the following URLs:\
|
||||
\
|
||||
wxMac-2.6.2 (needed only if you are building the BOINC Manager):\
|
||||
{\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt
|
||||
|
|
@ -93,11 +93,11 @@ wxMac-2.6.2 (needed only if you are building the BOINC Manager):\
|
|||
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://prdownloads.sourceforge.net/wxwindows/wxMac-2.6.2.tar.gz"}}{\fldrslt
|
||||
\f3\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.6.2.tar.gz}}\
|
||||
\
|
||||
curl-7.15.1:\
|
||||
curl-7.15.3:\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
|
||||
\f3\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\
|
||||
{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.15.1.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.15.1.tar.gz}}\
|
||||
{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.15.3.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.15.3.tar.gz}}\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
|
||||
|
||||
\f1\fs24 \cf0 \
|
||||
|
|
@ -113,7 +113,7 @@ jpeg-6b (needed only if you are building the BOINC libboinc_graphics_api.a libr
|
|||
|
||||
\f2\i \cf0 XCode 2.2 installs autoconf 2.59 and automake 1.63.
|
||||
\f1\i0
|
||||
\f2\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.6.2 and curl-7.15.1 require autoconf 2.59 and automake 1.93 or later. \
|
||||
\f2\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.6.2 and curl-7.15.3 require autoconf 2.59 and automake 1.93 or later. \
|
||||
\
|
||||
Upgrades for autoconf and automake are available from www.gnu.org: \
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
|
||||
|
|
@ -132,7 +132,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.6.2, nor the AutoMake scripts supplied with wxMac-2.6.2, curl-7.15.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.6.2, nor the AutoMake scripts supplied with wxMac-2.6.2, curl-7.15.3, 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.2 (or greater). It may be possible to use XCode 2.1 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
|
||||
|
|
@ -140,7 +140,7 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a
|
|||
[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.\
|
||||
\
|
||||
[2] Put the following 3 directories inside the BOINC_dev folder (omit any you don't need):\
|
||||
curl-7.15.1\
|
||||
curl-7.15.3\
|
||||
jpeg-6b\
|
||||
wxMac-2.6.2\
|
||||
\
|
||||
|
|
|
|||
|
|
@ -2752,7 +2752,7 @@
|
|||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||
GCC_PREFIX_HEADER = "";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.1/include";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.3/include";
|
||||
INSTALL_PATH = "";
|
||||
LIBRARY_SEARCH_PATHS = "../../wxMac-2.6.2/src/build/Deployment/libwx_mac.a";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.4;
|
||||
|
|
@ -2766,7 +2766,7 @@
|
|||
OTHER_CFLAGS_ppc = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -D_THREAD_SAFE -D__WXMAC -include ../clientgui/mac/config.h";
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
OTHER_LDFLAGS = (
|
||||
"../../curl-7.15.1/lib/.libs/libcurl.a",
|
||||
"../../curl-7.15.3/lib/.libs/libcurl.a",
|
||||
"-framework Carbon",
|
||||
"-lcrypto",
|
||||
"-lssl",
|
||||
|
|
@ -3490,7 +3490,7 @@
|
|||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||
GCC_PREFIX_HEADER = "";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.1/include";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.3/include";
|
||||
INSTALL_PATH = "";
|
||||
LIBRARY_SEARCH_PATHS = "../../wxMac-2.6.2/src/build/Deployment/libwx_mac.a";
|
||||
MACOSX_DEPLOYMENT_TARGET = "";
|
||||
|
|
@ -3504,7 +3504,7 @@
|
|||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
OTHER_LDFLAGS = (
|
||||
"../../curl-7.15.1/lib/.libs/libcurl.a",
|
||||
"../../curl-7.15.3/lib/.libs/libcurl.a",
|
||||
"-framework Carbon",
|
||||
"-lcrypto",
|
||||
"-lssl",
|
||||
|
|
@ -3536,7 +3536,7 @@
|
|||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||
GCC_PREFIX_HEADER = "";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.1/include";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.3/include";
|
||||
INSTALL_PATH = "";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
/usr/lib/gcc/darwin/3.3,
|
||||
|
|
@ -3553,7 +3553,7 @@
|
|||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
OTHER_LDFLAGS = (
|
||||
"../../curl-7.15.1/lib/.libs/libcurl.a",
|
||||
"../../curl-7.15.3/lib/.libs/libcurl.a",
|
||||
"-framework Carbon",
|
||||
"-lcrypto",
|
||||
"-lssl",
|
||||
|
|
@ -3578,7 +3578,7 @@
|
|||
buildSettings = {
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||
GCC_PREFIX_HEADER = "";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.1/include";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.3/include";
|
||||
INSTALL_PATH = "";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
/usr/lib/gcc/darwin/3.3,
|
||||
|
|
@ -3600,7 +3600,7 @@
|
|||
../clientgui/mac/config.h,
|
||||
);
|
||||
OTHER_LDFLAGS = (
|
||||
"../../curl-7.15.1/lib/.libs/libcurl.a",
|
||||
"../../curl-7.15.3/lib/.libs/libcurl.a",
|
||||
"-framework Carbon",
|
||||
"-lcrypto",
|
||||
"-lssl",
|
||||
|
|
@ -4406,7 +4406,7 @@
|
|||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||
GCC_PREFIX_HEADER = "";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.1/include";
|
||||
HEADER_SEARCH_PATHS = "../../curl-7.15.3/include";
|
||||
INSTALL_PATH = "";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
/usr/lib/gcc/darwin/4.0,
|
||||
|
|
@ -4421,7 +4421,7 @@
|
|||
);
|
||||
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
|
||||
OTHER_LDFLAGS = (
|
||||
"../../curl-7.15.1/lib/.libs/libcurl.a",
|
||||
"../../curl-7.15.3/lib/.libs/libcurl.a",
|
||||
"-framework Carbon",
|
||||
"-lcrypto",
|
||||
"-lssl",
|
||||
|
|
|
|||
|
|
@ -20,26 +20,23 @@
|
|||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Script to build the wxMac-2.6.2 library for BOINC as a Universal Binary
|
||||
#
|
||||
# Script to build Macintosh Universal Binary library of curl-7.15.1 for
|
||||
# Script to build Macintosh Universal Binary library of curl-7.15.3 for
|
||||
# use in building BOINC.
|
||||
#
|
||||
# by Charlie Fenton 2/17/06
|
||||
# by Charlie Fenton 4/27/06
|
||||
#
|
||||
## In Terminal, CD to the wxMac-2.6.2 directory.
|
||||
## cd [path]/curl-7.15.1/
|
||||
## In Terminal, CD to the curl-7.15.3 directory.
|
||||
## cd [path]/curl-7.15.3/
|
||||
## then run this script:
|
||||
## source buildcurl [ -clean ]
|
||||
##
|
||||
## the -clean argument will force a full rebuild.
|
||||
#
|
||||
|
||||
|
||||
if [ "$1" != "-clean" ]; then
|
||||
if [ -f lib/.libs/libcurl_ppc.a ] && [ -f lib/.libs/libcurl_i386.a ] && [ -f lib/.libs/libcurl.a ]; then
|
||||
|
||||
echo "curl-7.15.1 already built"
|
||||
echo "curl-7.15.3 already built"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -20,14 +20,12 @@
|
|||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Script to build the wxMac-2.6.2 library for BOINC as a Universal Binary
|
||||
#
|
||||
# Script to build Macintosh Universal Binary library of jpeg-6b for
|
||||
# use in building BOINC.
|
||||
#
|
||||
# by Charlie Fenton 2/17/06
|
||||
# by Charlie Fenton 4/27/06
|
||||
#
|
||||
## In Terminal, CD to the wxMac-2.6.2 directory.
|
||||
## In Terminal, CD to the jpeg-6b directory.
|
||||
## cd [path]/jpeg-6b/
|
||||
## then run this script:
|
||||
## source [ path_to_this_script ] [ -clean ]
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
#
|
||||
#
|
||||
# Master script to build Universal Binary libraries needed by BOINC:
|
||||
# curl-7.15.1, jpeg-6b and wxMac-2.6.2
|
||||
# curl-7.15.3, jpeg-6b and wxMac-2.6.2
|
||||
#
|
||||
# by Charlie Fenton 2/27/06
|
||||
# by Charlie Fenton 4/27/06
|
||||
#
|
||||
# Download these three packages and place them in a common parent
|
||||
# directory with the BOINC source tree.
|
||||
|
|
@ -41,13 +41,19 @@
|
|||
|
||||
echo ""
|
||||
echo "----------------------------------"
|
||||
echo "------- BUILD CURL-7.15.1 --------"
|
||||
echo "------- BUILD CURL-7.15.3 --------"
|
||||
echo "----------------------------------"
|
||||
echo ""
|
||||
|
||||
SCRIPT_DIR=`pwd`
|
||||
|
||||
cd ../../curl-7.15.1/
|
||||
if [ ! -f ../../curl-7.15.3/lib/url.c.orig ]; then
|
||||
patch -bN ../../curl-7.15.3/lib/url.c ../curl/patches/7.15.3.Socks/url_c.patch
|
||||
else
|
||||
echo "url.c already patched"
|
||||
fi
|
||||
|
||||
cd ../../curl-7.15.3/
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
source "${SCRIPT_DIR}/buildcurl.sh"
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue