diff --git a/checkin_notes b/checkin_notes
index b93649708e..e8bc248a40 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2452,3 +2452,18 @@ Matt 14 Mar 2007
top_users.php
top_hosts.php
top_teams.php
+
+Charlie 14 Mar 2007
+ - Mac: Update build scripts, XCode project and build instructions
+ for wxMac-2.8.2.
+ - Mac: Delete unused target AppStats from XCode project.
+
+ mac_build/
+ buildWxMac.sh
+ HowToBuildBOINC_XCode.rtf
+ setupForBOINC.sh
+ boinc.xcodeproj/
+ project.pbxproj
+ doc/
+ mac_build.php
+
diff --git a/doc/mac_build.php b/doc/mac_build.php
index 58be5d411c..ef2e57c710 100644
--- a/doc/mac_build.php
+++ b/doc/mac_build.php
@@ -104,15 +104,15 @@ 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.8.0, curl-7.16.1, and jpeg-6b. You can obtain these from the following URLs:
+BOINC depends on three third-party libraries: wxMac-2.8.2, 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):
+wxMac-2.8.2 (needed only if you are building the BOINC Manager):
";
show_link("http://www.wxwidgets.org");
-show_link("http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz");
+show_link("http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.2.tar.gz");
echo "
curl-7.16.1:
@@ -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.8.0 and curl-7.16.1 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.2 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.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.
+These are not done by either the XCode projects which come with wxMac-2.8.2, nor the AutoMake scripts supplied with wxMac-2.8.2, curl-7.16.1, or jpeg-6b. So be sure to use our special scripts to build these packages.
@@ -163,7 +163,7 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a
curl-7.16.1
jpeg-6b
-wxMac-2.8.0
+wxMac-2.8.2
@@ -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.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.
+
- wxMac-BOINC.xcodeproj is used to build the wxMac-2.8.2 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 a69a575498..d23779e010 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -91,15 +91,15 @@ 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.16.1, and jpeg-6b. You can obtain these from the following URLs:\
+\cf0 BOINC depends on three third-party libraries: wxMac-2.8.2, 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):\
+wxMac-2.8.2 (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.0.tar.gz"}}{\fldrslt
-\f2\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.0.tar.gz}}\
+\f2\fs26 http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.2.tar.gz}}\
\
curl-7.16.1:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -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.16.1 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.2 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.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.2, nor the AutoMake scripts supplied with wxMac-2.8.2, 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
@@ -150,7 +150,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.0\
+ wxMac-2.8.2\
\
Important: do not change the names of any of these 3 directories.\
\
@@ -226,7 +226,7 @@ The options for BuildMacBOINC.sh are:\
\f1\b0 is obsolete and should no longer be used.\
\'a5
\f0\b wxMac-BOINC.xcodeproj
-\f1\b0 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. \
+\f1\b0 is used to build the wxMac-2.8.2 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. \
\'a5
\f0\b boinc.xcodeproj
\f1\b0 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/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index 1a39965b9a..5f520eb445 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -695,20 +695,6 @@
remoteGlobalIDString = DD7748970A356C880025D05E;
remoteInfo = SetUpSecurity;
};
- DDA90E980B646172008F2E87 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 4086C8CB063AB30000D4CD53;
- remoteInfo = static;
- };
- DDA90E9A0B646172008F2E87 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 4086CBE1063AB30000D4CD53;
- remoteInfo = dynamic;
- };
DDAD19CC09090824004E7DD0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -758,6 +744,20 @@
remoteGlobalIDString = DDD0953E0A3EDD2500C95BA4;
remoteInfo = switcher;
};
+ DDF094180BA8C606003BB0FF /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = DDF0940F0BA8C606003BB0FF /* wxWindows.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 4086C8CB063AB30000D4CD53 /* libwx_mac_static.a */;
+ remoteInfo = static;
+ };
+ DDF0941A0BA8C606003BB0FF /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = DDF0940F0BA8C606003BB0FF /* wxWindows.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 4086CBE1063AB30000D4CD53 /* libwx_mac.dylib */;
+ remoteInfo = dynamic;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -1025,7 +1025,6 @@
DD9C94A30A5A3A4100AB0D10 /* BOINCBaseFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BOINCBaseFrame.h; path = ../clientgui/BOINCBaseFrame.h; sourceTree = SOURCE_ROOT; };
DDA12A910A369AB500FBDD12 /* SetupSecurity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SetupSecurity.h; path = ../clientgui/mac/SetupSecurity.h; sourceTree = SOURCE_ROOT; };
DDA12AAD0A369C5800FBDD12 /* SecurityUtility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SecurityUtility.cpp; path = ../clientgui/mac/SecurityUtility.cpp; sourceTree = SOURCE_ROOT; };
- DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "wxMac-BOINC.xcodeproj"; path = "../../wxMac-2.8.0/src/wxMac-BOINC.xcodeproj"; sourceTree = SOURCE_ROOT; };
DDA90F260B64673D008F2E87 /* libwx_mac_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwx_mac_static.a; path = "../../wxMac-2.8.0/src/build/Deployment/libwx_mac_static.a"; sourceTree = SOURCE_ROOT; };
DDA9D3BB09189A8C0060E7A7 /* Mac_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mac_GUI.cpp; path = ../clientgui/mac/Mac_GUI.cpp; sourceTree = SOURCE_ROOT; };
DDAEC9E107FA583B00A7BC36 /* SetVersion */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SetVersion; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1064,6 +1063,7 @@
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; };
DDEF388F0802B73500E87552 /* ViewStatistics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ViewStatistics.h; path = ../clientgui/ViewStatistics.h; sourceTree = SOURCE_ROOT; };
+ DDF0940F0BA8C606003BB0FF /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = "../../wxMac-2.8.2/src/wxWindows.xcodeproj"; sourceTree = SOURCE_ROOT; };
DDF166A908DF898A00C8C4A5 /* mac_backtrace.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mac_backtrace.C; path = ../lib/mac_backtrace.C; sourceTree = SOURCE_ROOT; };
DDF166AA08DF898A00C8C4A5 /* mac_backtrace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = mac_backtrace.h; path = ../lib/mac_backtrace.h; sourceTree = SOURCE_ROOT; };
DDF1F47A09822C3400482C89 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.csh; name = preinstall; path = ../mac_installer/preinstall; sourceTree = SOURCE_ROOT; };
@@ -1312,7 +1312,7 @@
DD7C5E7508110AE3002FCE1E /* ScreenSaver.framework */,
DD1929D80918A2F100C31BCF /* Security.framework */,
DDA90F260B64673D008F2E87 /* libwx_mac_static.a */,
- DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */,
+ DDF0940F0BA8C606003BB0FF /* wxWindows.xcodeproj */,
);
name = "External Frameworks and Libraries";
sourceTree = SOURCE_ROOT;
@@ -1477,15 +1477,6 @@
path = ../clientgui;
sourceTree = SOURCE_ROOT;
};
- DDA90E900B646172008F2E87 /* Products */ = {
- isa = PBXGroup;
- children = (
- DDA90E990B646172008F2E87 /* libwx_mac_static.a */,
- DDA90E9B0B646172008F2E87 /* libwx_mac.dylib */,
- );
- name = Products;
- sourceTree = "";
- };
DDCE78220A70BD29008218B6 /* common */ = {
isa = PBXGroup;
children = (
@@ -1498,6 +1489,15 @@
name = common;
sourceTree = "";
};
+ DDF094100BA8C606003BB0FF /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ DDF094190BA8C606003BB0FF /* libwx_mac_static.a */,
+ DDF0941B0BA8C606003BB0FF /* libwx_mac.dylib */,
+ );
+ name = Products;
+ sourceTree = "";
+ };
DDF9385307E288F0004DC076 /* Documentation */ = {
isa = PBXGroup;
children = (
@@ -2021,8 +2021,8 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = DDA90E900B646172008F2E87 /* Products */;
- ProjectRef = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */;
+ ProductGroup = DDF094100BA8C606003BB0FF /* Products */;
+ ProjectRef = DDF0940F0BA8C606003BB0FF /* wxWindows.xcodeproj */;
},
);
targets = (
@@ -2047,18 +2047,18 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- DDA90E990B646172008F2E87 /* libwx_mac_static.a */ = {
+ DDF094190BA8C606003BB0FF /* libwx_mac_static.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libwx_mac_static.a;
- remoteRef = DDA90E980B646172008F2E87 /* PBXContainerItemProxy */;
+ remoteRef = DDF094180BA8C606003BB0FF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- DDA90E9B0B646172008F2E87 /* libwx_mac.dylib */ = {
+ DDF0941B0BA8C606003BB0FF /* libwx_mac.dylib */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.dylib";
path = libwx_mac.dylib;
- remoteRef = DDA90E9A0B646172008F2E87 /* PBXContainerItemProxy */;
+ remoteRef = DDF0941A0BA8C606003BB0FF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -2914,22 +2914,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = "";
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = (
@@ -2980,22 +2979,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = 10.3;
OTHER_CFLAGS = (
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1030",
@@ -3044,22 +3042,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DMAC_OS_X_VERSION_MAX_ALLOWED=1040",
@@ -3108,22 +3105,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DHAVE_CONFIG_H",
@@ -4065,22 +4061,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = "";
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = (
@@ -4130,22 +4125,21 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch;
HEADER_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/include/wx/",
- "../../wxMac-2.8.0/include",
+ "../../wxMac-2.8.2/src/build/include/",
+ "../../wxMac-2.8.2/include",
../clientgui,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(USER_APPS_DIR)";
LIBRARY_SEARCH_PATHS = (
- "../../wxMac-2.8.0/src/build/Deployment/",
- ../lib,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_5)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
- LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../../wxMac-2.8.2/src/build/Deployment\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_4 = "\"../../wxMac-2.8.2/src/build/Deployment/\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"../lib\"";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DHAVE_CONFIG_H",
diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh
index 8d23cfddb8..d6df45a992 100644
--- a/mac_build/buildWxMac.sh
+++ b/mac_build/buildWxMac.sh
@@ -20,21 +20,14 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Script to build the wxMac-2.8.0 library for BOINC as a Universal Binary
+# Script to build the wxMac-2.8.1 library for BOINC as a Universal Binary
#
# by Charlie Fenton 7/21/06
-# Updated for wx-Mac 2.8.0 1/19/07
+# Updated for wx-Mac 2.8.2 3/14/07
#
-## 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/
+## In Terminal, CD to the wxMac-2.8.2 directory.
+## cd [path]/wxMac-2.8.2/
## then run this script:
## source [ path_to_this_script ] [ -clean ]
##
@@ -48,21 +41,14 @@ 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
-
+## The following line is needed because the XCode project is missing the
+## "Run script" phase which should run the wxMac-2.8.2/distrib/mac/pbsetup-sh script
+sh distrib/mac/pbsetup-sh src src/build
if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then
echo "Deployment libwx_mac_static.a already built"
else
- 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
+ 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
if [ $? -ne 0 ]; then return 1; fi
fi
@@ -70,7 +56,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/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
+ 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
if [ $? -ne 0 ]; then return 1; fi
fi
diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh
index f23ba8598e..5fe804f396 100644
--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@@ -21,11 +21,10 @@
#
#
# Master script to build Universal Binary libraries needed by BOINC:
-# curl-7.16.1, jpeg-6b and wxMac-2.8.0
+# curl-7.16.1, jpeg-6b and wxMac-2.8.2
#
# 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
+# Updated for curl-7.16.1 and wx-Mac 2.8.2 3/14/07
#
# Download these three packages and place them in a common parent
# directory with the BOINC source tree.
@@ -76,15 +75,13 @@ if [ $? -ne 0 ]; then return 1; fi
echo ""
echo "----------------------------------"
-echo "------- BUILD wxMac-2.8.0 --------"
+echo "------- BUILD wxMac-2.8.2 --------"
echo "----------------------------------"
echo ""
cd "${SCRIPT_DIR}"
-cp -fpR wxMac-BOINC.xcodeproj ../../wxMac-2.8.0/src/
-
-cd ../../wxMac-2.8.0/
+cd ../../wxMac-2.8.2/
if [ $? -ne 0 ]; then return 1; fi
source "${SCRIPT_DIR}/buildWxMac.sh" ${doclean}
if [ $? -ne 0 ]; then return 1; fi