diff --git a/checkin_notes b/checkin_notes
index efd496fe4d..f3813557db 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2246,3 +2246,17 @@ David 8 Mar 2007
lib/
filesys.C
network.C,h
+
+Charlie 8 Mar 2007
+ - Mac: Update build scripts, XCode project and build instructions
+ for cURL 7.16.1.
+ - Mac: Delete unused target AppStats from XCode project.
+
+ mac_build/
+ buildcurl.sh
+ HowToBuildBOINC_XCode.rtf
+ setupForBOINC.sh
+ boinc.xcodeproj/
+ project.pbxproj
+ doc/
+ mac_build.php
\ No newline at end of file
diff --git a/doc/mac_build.php b/doc/mac_build.php
index ae8c2e67ea..58be5d411c 100644
--- a/doc/mac_build.php
+++ b/doc/mac_build.php
@@ -104,21 +104,21 @@ After building the libraries as Universal Binaries using the second method, you
Building BOINC Manager with embedded Core Client plus libraries libboinc.a and libboinc_graphics_api.a
-BOINC depends on three third-party libraries: wxMac-2.6.3, curl-7.5.15, and jpeg-6b. You can obtain these from the following URLs:
+BOINC depends on three third-party libraries: wxMac-2.8.0, curl-7.16.1, and jpeg-6b. You can obtain these from the following URLs:
-wxMac-2.6.3 (needed only if you are building the BOINC Manager):
+wxMac-2.8.0 (needed only if you are building the BOINC Manager):
";
show_link("http://www.wxwidgets.org");
-show_link("http://prdownloads.sourceforge.net/wxwindows/wxMac-2.6.3.tar.gz");
+show_link("http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz");
echo "
-curl-7.5.15:
+curl-7.16.1:
";
show_link("http://curl.haxx.se");
-show_link("http://curl.haxx.se/download/curl-7.5.15.tar.gz");
+show_link("http://curl.haxx.se/download/curl-7.16.1.tar.gz");
echo "
jpeg-6b (needed only if you are building the BOINC libboinc_graphics_api.a library):
@@ -129,7 +129,7 @@ show_link("ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz");
echo "
-XCode 2.2 installs autoconf 2.59 and automake 1.63. To determine the version number, type 'autoconf --version' or 'automake --version' . Building wxMac-2.6.3 and curl-7.5.15 require autoconf 2.59 and automake 1.93 or later.
+XCode 2.2 installs autoconf 2.59 and automake 1.63. To determine the version number, type 'autoconf --version' or 'automake --version' . Building wxMac-2.8.0 and curl-7.16.1 require autoconf 2.59 and automake 1.93 or later.
Upgrades for autoconf and automake are available from www.gnu.org:
@@ -147,7 +147,7 @@ As stated above, all BOINC software for Power PC Macs must be built using GCC 3.
-These are not done by either the XCode projects which come with wxMac-2.6.3, nor the AutoMake scripts supplied with wxMac-2.6.3, curl-7.5.15, 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.
@@ -161,9 +161,9 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a
Put the following 3 directories inside the BOINC_dev folder (omit any you don't need):
-curl-7.5.15
+curl-7.16.1
jpeg-6b
-wxMac-2.6.3
+wxMac-2.8.0
@@ -266,7 +266,7 @@ Note: You may find three XCode projects in the BOINC_dev/boinc/mac_build/ direct
- boinc.pbproj is obsolete and should no longer be used.
-
- wxMac-BOINC.xcodeproj is used to build the wxMac-2.6.3 library in conjunction with the setupForBoinc.sh or buildWxMac.sh scripts. Do not use it as a stand-alone project; it will not configure the wxMac libraries correctly when run outside of these scripts.
+
- wxMac-BOINC.xcodeproj is used to build the wxMac-2.8.0 library in conjunction with the setupForBoinc.sh or buildWxMac.sh scripts. Do not use it as a stand-alone project; it will not configure the wxMac libraries correctly when run outside of these scripts.
- boinc.xcodeproj builds BOINC. It can be used either with the BuildMacBOINC.sh script or as a stand-alone project. It has two extra build configurations, i386-Deployment and ppc-Deployment, which can be used for testing only to build for just one architecture. The Development build configuration builds only the native architecture and is used for debugging. The Deployment build configuration builds a universal binary and is suitable for release builds.
diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf
index cc1e98e8bc..957624a0df 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -91,7 +91,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.8.0, curl-7.5.15, 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. You can obtain these from the following URLs:\
\
wxMac-2.8.0 (needed only if you are building the BOINC Manager):\
{\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt
@@ -101,11 +101,11 @@ wxMac-2.8.0 (needed only if you are building the BOINC Manager):\
\f1\fs24 {\field{\*\fldinst{HYPERLINK "http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz"}}{\fldrslt
\f2\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz}}\
\
-curl-7.5.15:\
+curl-7.16.1:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f2\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.3.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.5.15.tar.gz}}\
+ {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.16.1.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.16.1.tar.gz}}\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f1\fs24 \cf0 \
@@ -121,7 +121,7 @@ jpeg-6b (needed only if you are building the BOINC libboinc_graphics_api.a libr
\f3\i \cf0 XCode 2.2 installs autoconf 2.59 and automake 1.63.
\f1\i0
-\f3\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.8.0 and curl-7.5.15 require autoconf 2.59 and automake 1.93 or later. \
+\f3\i To determine the version number, type "autoconf --version" or "automake --version" . Building wxMac-2.8.0 and curl-7.16.1 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
@@ -140,7 +140,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.0, nor the AutoMake scripts supplied with wxMac-2.8.0, curl-7.5.15, 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.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
@@ -148,7 +148,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.5.15\
+ curl-7.16.1\
jpeg-6b\
wxMac-2.8.0\
\
diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index 829d819f88..d9ce8e78ad 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -25,7 +25,6 @@
DDD095510A3EE09900C95BA4 /* PBXTargetDependency */,
DD1AFEE60A512FF000EE5B82 /* PBXTargetDependency */,
DD45C4A10A53E73500E923D1 /* PBXTargetDependency */,
- DD58E60D0AC7D69F0049DBB6 /* PBXTargetDependency */,
);
name = Build_All;
productName = Build_All;
@@ -660,13 +659,6 @@
remoteGlobalIDString = DD3E14D30A774397007E0084;
remoteInfo = mgr_boinc;
};
- DD58E60C0AC7D69F0049DBB6 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = DDD997D70AC3D1DD00D0DACF;
- remoteInfo = AppStats;
- };
DD664F18084321A2009BFB11 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -833,8 +825,6 @@
DD33C6F708B5BB4500768630 /* acct_setup.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = acct_setup.C; path = ../client/acct_setup.C; sourceTree = SOURCE_ROOT; };
DD33C70208B5BEDE00768630 /* http_curl.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = http_curl.C; path = ../client/http_curl.C; sourceTree = SOURCE_ROOT; };
DD33C70308B5BEDE00768630 /* http_curl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = http_curl.h; path = ../client/http_curl.h; sourceTree = SOURCE_ROOT; };
- DD33C74208B5C72F00768630 /* curl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = curl.h; path = ../curl/include/curl/curl.h; sourceTree = SOURCE_ROOT; };
- DD33C74308B5C72F00768630 /* curlver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = curlver.h; path = ../curl/include/curl/curlver.h; sourceTree = SOURCE_ROOT; };
DD344B3D07C5ABF40043025C /* acct_mgr.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = acct_mgr.C; path = ../client/acct_mgr.C; sourceTree = SOURCE_ROOT; };
DD344B3E07C5ABF40043025C /* acct_mgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = acct_mgr.h; path = ../client/acct_mgr.h; sourceTree = SOURCE_ROOT; };
DD344B4807C5AC4C0043025C /* app_control.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = app_control.C; path = ../client/app_control.C; sourceTree = SOURCE_ROOT; };
@@ -1071,7 +1061,6 @@
DDD0953F0A3EDD2500C95BA4 /* switcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = switcher; sourceTree = BUILT_PRODUCTS_DIR; };
DDD095480A3EDF2D00C95BA4 /* switcher.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = switcher.C; sourceTree = ""; };
DDD74D8707CF482E0065AC9D /* boinc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinc; sourceTree = BUILT_PRODUCTS_DIR; };
- DDD997D80AC3D1DD00D0DACF /* AppStats */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = AppStats; sourceTree = BUILT_PRODUCTS_DIR; };
DDE2552B07C62F3E008E7D6E /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; };
DDEB3CA80981084A0087E200 /* GridRepublic.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GridRepublic.icns; path = ../client/mac/GridRepublic.icns; sourceTree = SOURCE_ROOT; };
DDEF388E0802B73500E87552 /* ViewStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStatistics.cpp; path = ../clientgui/ViewStatistics.cpp; sourceTree = SOURCE_ROOT; };
@@ -1248,13 +1237,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- DDD997D60AC3D1DD00D0DACF /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
DDFF2ACD0A53D4AE002BC19D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -1283,7 +1265,6 @@
DD1AFEBA0A512D8700EE5B82 /* BOINC Installer.app */,
DDFF2AD30A53D4AE002BC19D /* setprojectgrp */,
DD3E15420A774397007E0084 /* BOINCManager.app */,
- DDD997D80AC3D1DD00D0DACF /* AppStats */,
);
name = Products;
sourceTree = SOURCE_ROOT;
@@ -1293,7 +1274,6 @@
children = (
DD40827D07D30AA800163EF5 /* jpeglib.h */,
F54B8FBE02AC0A0C01FB7237 /* client */,
- DD33C72A08B5C70700768630 /* curl */,
DD81C3F707C5D03B0098A04D /* clientgui */,
DD1277BC081F3E59007B5DE1 /* mac_installer */,
DDF9385307E288F0004DC076 /* Documentation */,
@@ -1352,15 +1332,6 @@
name = mac_installer;
sourceTree = SOURCE_ROOT;
};
- DD33C72A08B5C70700768630 /* curl */ = {
- isa = PBXGroup;
- children = (
- DD33C74208B5C72F00768630 /* curl.h */,
- DD33C74308B5C72F00768630 /* curlver.h */,
- );
- name = curl;
- sourceTree = "";
- };
DD81C3F707C5D03B0098A04D /* clientgui */ = {
isa = PBXGroup;
children = (
@@ -2026,22 +1997,6 @@
productReference = DDD74D8707CF482E0065AC9D /* boinc */;
productType = "com.apple.product-type.tool";
};
- DDD997D70AC3D1DD00D0DACF /* AppStats */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = DDD997DA0AC3D1FB00D0DACF /* Build configuration list for PBXNativeTarget "AppStats" */;
- buildPhases = (
- DDD997D50AC3D1DD00D0DACF /* Sources */,
- DDD997D60AC3D1DD00D0DACF /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = AppStats;
- productName = AppStats;
- productReference = DDD997D80AC3D1DD00D0DACF /* AppStats */;
- productType = "com.apple.product-type.tool";
- };
DDFF2ACA0A53D4AE002BC19D /* setprojectgrp */ = {
isa = PBXNativeTarget;
buildConfigurationList = DDFF2ACE0A53D4AE002BC19D /* Build configuration list for PBXNativeTarget "setprojectgrp" */;
@@ -2090,7 +2045,6 @@
DD1AFEA40A512D8700EE5B82 /* Install_BOINC */,
DDFF2ACA0A53D4AE002BC19D /* setprojectgrp */,
DD3E14D30A774397007E0084 /* mgr_boinc */,
- DDD997D70AC3D1DD00D0DACF /* AppStats */,
);
};
/* End PBXProject section */
@@ -2680,13 +2634,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- DDD997D50AC3D1DD00D0DACF /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
DDFF2ACB0A53D4AE002BC19D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2738,11 +2685,6 @@
target = DD3E14D30A774397007E0084 /* mgr_boinc */;
targetProxy = DD58247C0B198BDD003B6A2F /* PBXContainerItemProxy */;
};
- DD58E60D0AC7D69F0049DBB6 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = DDD997D70AC3D1DD00D0DACF /* AppStats */;
- targetProxy = DD58E60C0AC7D69F0049DBB6 /* PBXContainerItemProxy */;
- };
DD664F19084321A2009BFB11 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DD69FEE708416C1300C01361 /* cmd_boinc */;
@@ -3558,7 +3500,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = "";
@@ -3608,7 +3550,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -4535,7 +4477,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -5068,7 +5010,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = "";
@@ -5116,7 +5058,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
MACOSX_DEPLOYMENT_TARGET = 10.3;
@@ -5638,7 +5580,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
- HEADER_SEARCH_PATHS = "../../curl-7.15.5/include";
+ HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/4.0;
MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -5890,106 +5832,6 @@
};
name = Deployment;
};
- DDD997DB0AC3D1FB00D0DACF /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- ZERO_LINK = NO;
- };
- name = Development;
- };
- DDD997DC0AC3D1FB00D0DACF /* Dev_noSandbox */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- ZERO_LINK = NO;
- };
- name = Dev_noSandbox;
- };
- DDD997DD0AC3D1FB00D0DACF /* ppc_Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- STRIP_INSTALLED_PRODUCT = YES;
- ZERO_LINK = NO;
- };
- name = ppc_Deployment;
- };
- DDD997DE0AC3D1FB00D0DACF /* i386_Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- STRIP_INSTALLED_PRODUCT = YES;
- ZERO_LINK = NO;
- };
- name = i386_Deployment;
- };
- DDD997DF0AC3D1FB00D0DACF /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- STRIP_INSTALLED_PRODUCT = YES;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- DDD997E00AC3D1FB00D0DACF /* Deploy_noSandbox */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "..//**";
- INSTALL_PATH = "";
- PREBINDING = NO;
- PRODUCT_NAME = AppStats;
- SKIP_INSTALL = YES;
- STRIP_INSTALLED_PRODUCT = YES;
- ZERO_LINK = NO;
- };
- name = Deploy_noSandbox;
- };
DDFF2ACF0A53D4AE002BC19D /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -6264,19 +6106,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = ppc_Deployment;
};
- DDD997DA0AC3D1FB00D0DACF /* Build configuration list for PBXNativeTarget "AppStats" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- DDD997DB0AC3D1FB00D0DACF /* Development */,
- DDD997DC0AC3D1FB00D0DACF /* Dev_noSandbox */,
- DDD997DD0AC3D1FB00D0DACF /* ppc_Deployment */,
- DDD997DE0AC3D1FB00D0DACF /* i386_Deployment */,
- DDD997DF0AC3D1FB00D0DACF /* Deployment */,
- DDD997E00AC3D1FB00D0DACF /* Deploy_noSandbox */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = ppc_Deployment;
- };
DDFF2ACE0A53D4AE002BC19D /* Build configuration list for PBXNativeTarget "setprojectgrp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh
index d50206c57d..cd6406924a 100644
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@@ -20,15 +20,16 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Script to build Macintosh Universal Binary library of curl-7.15.5 for
+# Script to build Macintosh Universal Binary library of curl-7.16.1 for
# use in building BOINC.
#
# by Charlie Fenton 7/21/06
+# Updated for curl-7.16.1 3/8/07
#
-## In Terminal, CD to the curl-7.15.5 directory.
-## cd [path]/curl-7.15.5/
+## In Terminal, CD to the curl-7.16.1 directory.
+## cd [path]/curl-7.16.1/
## then run this script:
-## source buildcurl [ -clean ]
+## source buildcurl.sh [ -clean ]
##
## the -clean argument will force a full rebuild.
#
@@ -36,7 +37,7 @@
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.5 already built"
+ echo "curl-7.16.1 already built"
return 0
fi
fi
diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh
index 16b5df87c3..f23ba8598e 100644
--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@@ -21,10 +21,11 @@
#
#
# Master script to build Universal Binary libraries needed by BOINC:
-# curl-7.15.5, jpeg-6b and wxMac-2.8.0
+# curl-7.16.1, jpeg-6b and wxMac-2.8.0
#
# by Charlie Fenton 7/21/06
# Updated for wx-Mac 2.8.0 1/19/07
+# Updated for curl-7.16.1 3/8/07
#
# Download these three packages and place them in a common parent
# directory with the BOINC source tree.
@@ -49,19 +50,13 @@ fi
echo ""
echo "----------------------------------"
-echo "------- BUILD CURL-7.15.5 --------"
+echo "------- BUILD CURL-7.16.1 --------"
echo "----------------------------------"
echo ""
SCRIPT_DIR=`pwd`
-if [ ! -f ../../curl-7.15.5/lib/url.c.orig ]; then
-patch -bN ../../curl-7.15.5/lib/url.c ../curl/patches/7.15.5.Socks/url_c.patch
-else
-echo "url.c already patched"
-fi
-
-cd ../../curl-7.15.5/
+cd ../../curl-7.16.1/
if [ $? -ne 0 ]; then return 1; fi
source "${SCRIPT_DIR}/buildcurl.sh" ${doclean}
if [ $? -ne 0 ]; then return 1; fi