diff --git a/doc/mac_build.html b/doc/mac_build.html
index 41bf83a19e..829c84a5a3 100644
--- a/doc/mac_build.html
+++ b/doc/mac_build.html
@@ -12,17 +12,15 @@
p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; text-align: center; font: 12.0px Helvetica}
p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
p.p5 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier}
- p.p6 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000000}
- p.p7 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Lucida Grande; min-height: 15.0px}
- p.p8 {margin: 0.0px 0.0px 0.0px 0.0px; text-align: center; font: 14.0px Helvetica; color: #000000}
- p.p9 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Courier; color: #000000}
- p.p10 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Courier; color: #000000; min-height: 14.0px}
- p.p11 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; color: #4e007c}
- p.p12 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; color: #0000ef}
- p.p13 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; min-height: 16.0px}
+ p.p6 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Lucida Grande; min-height: 15.0px}
+ p.p7 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000000}
+ p.p8 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Courier; min-height: 14.0px}
+ p.p9 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; color: #4e007c}
+ p.p10 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; color: #0000ef}
+ p.p11 {margin: 0.0px 0.0px 0.0px 0.0px; font: 13.0px Courier; min-height: 16.0px}
span.s1 {font: 12.0px Helvetica}
span.s2 {font: 13.0px Courier}
- span.s3 {color: #000000}
+ span.s3 {font: 12.0px Courier; color: #000000}
span.s4 {text-decoration: underline}
span.s5 {text-decoration: underline ; color: #0000ef}
span.Apple-tab-span {white-space:pre}
@@ -155,13 +153,13 @@
Both -lib and -client may be specified to build five targets (no BOINC Manager.)
-Note: You may find three XCode projects in the BOINC_dev/boinc/mac_build/ directory:
- • boinc.pbproj is obsolete and should no longer be used.
- • wxMac-BOINC.xcodeproj is used to build the wxMac-2.6.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 uised for debugging. The Deployment build configuration builds a universal binary and is suitable for release builds.
-
+Note: You may find three XCode projects in the BOINC_dev/boinc/mac_build/ directory:
+ • boinc.pbproj is obsolete and should no longer be used.
+ • wxMac-BOINC.xcodeproj is used to build the wxMac-2.6.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.
+
-Building BOINC Manager Installer
+Building BOINC Manager Installer
To build the Installer for the BOINC Manager, if the BOINC version number is x.y.z, type the following in Terminal:
@@ -170,12 +168,12 @@
Substitute the 3 parts of the BOINC version number for x y and z in the above. For example, to build the installer for BOINC version 5.3.19, the command would be
source {path}BOINC_dev/boinc/mac_installer/release_boinc.sh 5 3 19
-
-This will create a directory "BOINC_Installer" in the BOINC_dev directory
-
-To build version 5.3.19 of the Grid Republic flavor of BOINC, you would type:
+This will create a directory "BOINC_Installer/New_Release_5_3_19" in the BOINC_dev directory.
+
+To build version 5.3.19 of the Grid Republic flavor of BOINC, you would type:
cd {path}BOINC_dev/boinc/
source {path}BOINC_dev/boinc/mac_installer/release_GridRepublic.sh 5 3 19
+This will create a directory "BOINC_Installer/New_Release_GR_5_3_19" in the BOINC_dev directory.
Building project applications
@@ -207,8 +205,8 @@
So it is important to make a native Intel application available as soon as possible.
It is very easy to add a new platform to your server with the xadd utility. For directions on how to do this, see these web pages:
-http://boinc.berkeley.edu/platform.php
-http://boinc.berkeley.edu/tool_xadd.php
+http://boinc.berkeley.edu/platform.php
+http://boinc.berkeley.edu/tool_xadd.php
BOINC supports all PowerPC Macs running OS 10.3.0 or later, and all Intel Macs. (The Intel Macs themselves require OS 10.4.4 or later.)
@@ -228,10 +226,10 @@
Additional information on building Unix applications universal can be found here:
http://developer.apple.com/documentation/Porting/Conceptual/PortingUnix/compiling/chapter_4_section_3.html
-
+
and here:
http://developer.apple.com/documentation/MacOSX/Conceptual/universal_binary/universal_binary_compiling/chapter_2_section_7.html
-
+
For information on making your code work with GCC 4:
http://developer.apple.com/releasenotes/DeveloperTools/GCC40PortingReleaseNotes/index.html
diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf
index 54a197dc86..327d78bd0a 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -210,8 +210,7 @@ The options for BuildMacBOINC.sh are:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f0\b \cf0 Note:
-\f1\b0 \cf0 You may find three XCode projects in the BOINC_dev/boinc/mac_build/ directory: \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\f1\b0 You may find three XCode projects in the BOINC_dev/boinc/mac_build/ directory: \
\'a5
\f0\b boinc.pbproj
\f1\b0 is obsolete and should no longer be used.\
@@ -220,16 +219,17 @@ The options for BuildMacBOINC.sh are:\
\f1\b0 is used to build the wxMac-2.6.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 uised for debugging. The Deployment build configuration builds a universal binary and is suitable for release builds.\cf0 \
+\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.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f4 \cf0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-\f1 \
+\f1 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
\f0\b\fs28 \cf0 Building BOINC Manager Installer
-\f1\b0\fs24 \cf0 \
+\f1\b0\fs24 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\cf0 \
To build the Installer for the BOINC Manager, if the BOINC version number is x.y.z, type the following in Terminal:\
@@ -238,9 +238,8 @@ To build the Installer for the BOINC Manager, if the BOINC version number is x.y
\f3\fs26 \cf0 cd \{path\}BOINC_dev/boinc/\
source \{path\}BOINC_dev/boinc/mac_installer/release_boinc.sh x y z\
-\pard\pardeftab720\ql\qnatural
-\f1\fs24 \cf0 \
+\f1\fs24 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\cf0 Substitute the 3 parts of the BOINC version number for x y and z in the above. For example, to build the installer for BOINC version 5.3.19, the command would be\
\pard\pardeftab720\ql\qnatural
@@ -248,19 +247,24 @@ source \{path\}BOINC_dev/boinc/mac_installer/release_boinc.sh x y z\
\f3\fs26 \cf0 source \{path\}BOINC_dev/boinc/mac_installer/release_boinc.sh 5 3 19\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-\f1\fs24 \cf0 \
-
-\f3 \cf0 This will create a directory "BOINC_Installer" in the BOINC_dev directory\
+\f1\fs24 \cf0 This will create a directory "BOINC_Installer/New_Release_5_3_19" in the BOINC_dev directory.
+\f3 \cf0 \
\
-To build version 5.3.19 of the Grid Republic flavor of BOINC, you would type:
-\f1 \cf0 \
+
+\f1 \cf0 To build version 5.3.19 of the Grid Republic flavor of BOINC, you would type:
+\f3 \cf0
+\f1 \
\pard\pardeftab720\ql\qnatural
\f3\fs26 \cf0 cd \{path\}BOINC_dev/boinc/\
source \{path\}BOINC_dev/boinc/mac_installer/release_GridRepublic.sh 5 3 19\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f1\fs24 \cf0 This will create a directory "BOINC_Installer/New_Release_GR_5_3_19" in the BOINC_dev directory.
+\f3 \cf0 \
\pard\pardeftab720\ql\qnatural
-\f1\fs24 \cf0 \
+\f1 \cf0 \
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc