diff --git a/checkin_notes b/checkin_notes index a2af554cfc..61490674ef 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6516,3 +6516,9 @@ Rom 12 May 2005 app_graphics.C client/win/ win_screensaver.cpp + +Charlie 13 may 2005 + Mac: Update build instructions. + + mac_build/ + HowToBuildBOINC_XCode.rtf diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf index c67e07ae1f..9bcbc1c404 100644 --- a/mac_build/HowToBuildBOINC_XCode.rtf +++ b/mac_build/HowToBuildBOINC_XCode.rtf @@ -1,6 +1,6 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset77 LucidaGrande; -} +{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier; +\f3\fnil\fcharset77 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -11,7 +11,7 @@ \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 5/5/05\ +Last updated 5/13/05\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \cf0 \ NOTE: Substitute the appropriate path for [wxpath] and [boincpath] throughout this document. Typically, [boincpath] will end in "/boinc" or /boinc_public", and [wxpath] will end in "/wxMac-2.6.0".\ @@ -29,45 +29,82 @@ You must have installed XCode's optional Cross-Development SDK for system 10.3.0 (1) First download wxMac-2.6.0 from www.wxwidgets.org and build it:\ Set the following three environment variables NEXT_ROOT, CPPFLAGS and LDFLAGS. These commands are for the bash shell; use the equivalent commands if you are running a different UNIX shell. These environment variables allow the application to be built using the OS 10.3.0 compatibility SDK.\ \ -NEXT_ROOT=/Developer/SDKs/MacOSX10.3.0.sdk;export NEXT_ROOT\ + +\f2 CPPFLAGS="-isystem /Developer/SDKs/MacOSX10.3.0.sdk/usr/include -DMAC_OS_X_VERSION_MAX_ALLOWED=1030";export CPPFLAGS\ + +\f1 \ + +\f2 LDFLAGS=-L/Developer/SDKs/MacOSX10.3.0.sdk/usr/lib/gcc/darwin/3.3;export LDFLAGS\ + +\f1 \ +Then continue building wxMac-2.6.0:\ \ -CPPFLAGS="-isystem /Developer/SDKs/MacOSX10.3.0.sdk/usr/include -DMAC_OS_X_VERSION_MAX_ALLOWED=1030";export CPPFLAGS\ + +\f2 cd [wxpath]\ \ -LDFLAGS=-L/Developer/SDKs/MacOSX10.3.0.sdk/usr/lib/gcc/darwin/3.3;export LDFLAGS\ +autoconf\ \ -The continue building wxMac-2.6.0:\ -\ -cd [wxpath]\ mkdir osx-build\ -cd osx-build\ -../configure --disable-shared --with-opengl\ -make\ \ +cd osx-build\ +\ +./configure --disable-shared --with-opengl\ + +\f1 \ (2) Run Configure to create the correct config.h file for BOINC:\ \ -cd [boincpath]\ -./configure --disable-server --with-apple-opengl-framework\ +Add the path to wx-config to the standard search path:\ \ -(3) Create a symbolic link [path]/ boinc/wx_lib pointing to \ + +\f2 PATH=$PATH:[wxpath]/osx-build;export PATH\ + +\f1 \ +Then continue configuring BOINC:\ +\ + +\f2 cd [boincpath]\ +\ +./_autosetup\ +\ +autoconf\ + +\f1 \ +Note: It appears that you can safely ignore error messages from _autosetup.\ +\ + +\f2 ./configure --disable-server --with-apple-opengl-framework --oldincludedir=/Developer/SDKs/MacOSX10.3.0.sdk/usr/include --libdir=/Developer/SDKs/MacOSX10.3.0.sdk/usr/lib \ + +\f1 \ +If you wish to build BOINC from the command line:\ +\ + +\f2 make\ + +\f1 \ +\ +\ +(3) Create a symbolic link [boincpath]/wx_lib pointing to \ [wxpath]/osx-build/lib/\ \ -(4) Create a symbolic link [path]/ boinc/wxinclude pointing to \ +(4) Create a symbolic link [boincpath]/wxinclude pointing to \ [wxpath]/include\ \ -(5) Create a symbolic link [path]/ boinc/jpeglib pointing to \ +(5) Create a symbolic link [boincpath]/jpeglib pointing to \ your jpeg-6b directory (or whatever directory contains the jpeglib source files). If you have the seti_boinc source directory which contains jpeglib, you can point the symbolic link there.\ \ For example, if the boinc, wxMac-2.6.0 and jpeg-6b directories are all in \ [wxpath] then the commands would be:\ \ -cd [boincpath] \ + +\f2 cd [boincpath] \ \ ln -s [wxpath]/osx-build/lib ./wx_lib\ \ ln -s [wxpath]/include ./wxinclude\ \ -ln -s [path]/jpeg-6b ./jpeglib\ -\ +ln -s [jpegpath]/jpeg-6b ./jpeglib\ + +\f1 \ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -85,7 +122,7 @@ BOINC libraries, screensaver and helper applications (4) If you have switched Build Style, be sure to do a "Clean All Targets" from the Build menu; otherwise object files from the old build style will not be rebuilt in the new build style.\ \ (5) If you are building the screensaver, be sure to unstuff the file: \ -boinc/clientgui/mac/BOINCSaver.nib.sit\ +[boincpath]/clientgui/mac/BOINCSaver.nib.sit\ \ (6) Select Build from the Build menu. I suggest you also open the Detailed Build Results window from the Build menu. Wait a long time while it compiles.\ \ @@ -168,12 +205,12 @@ You will now have the following directory structure:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1\b0 \cf0 \ -(1) Create a directory and name it appropriately, e.g. BOINC_Mac_Installer. Copy the installer package and the ReadMe file into the directory.\ +(1) Create a directory and name it appropriately, e.g. "boinc_4.37_macOSX". Copy the installer package and the ReadMe file into the directory.\ \ (2)After selecting the directory you just created and populated, select \ul Create archive\ulnone from the Finder's File menu. This will zip the file. (Note: if you want to stuff the file instead of zipping it, be sure to uncheck "stuff originals instead of aliases" in DropStuff's preferences.)\ \ -(3) Rename the zip file as appropriate to show the version number; for example, -\f2 BOINC_Mac_4_67.zip +(3) Rename the zip file as appropriate to show the version number; for example, boinc_4.37_macOSX +\f3 .zip \f1 \ \ \ @@ -191,7 +228,8 @@ You will now have the following directory structure:\ \f1\b0 \cf0 \ (1) Set the following five environment variables NEXT_ROOT, CPPFLAG, LDFLAGS, PROJECTDIR and BOINCDIR. These commands are for the bash shell; use the equivalent commands if you are running a different UNIX shell. The first three environment variables allow the application to be built using the OS 10.3.0 compatibility SDK.\ \ -NEXT_ROOT=/Developer/SDKs/MacOSX10.3.0.sdk;export NEXT_ROOT\ + +\f2 NEXT_ROOT=/Developer/SDKs/MacOSX10.3.0.sdk;export NEXT_ROOT\ \ CPPFLAGS="-isystem /Developer/SDKs/MacOSX10.3.0.sdk/usr/include -DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -L[boincpath]/seti_boinc/jpeglib -ljpeg";export CPPFLAGS\ \ @@ -200,18 +238,23 @@ LDFLAGS=-L/Developer/SDKs/MacOSX10.3.0.sdk/usr/lib/gcc/darwin/3.3;export LDFLAGS PROJECTDIR=[boincpath]/seti_boinc;export PROJECTDIR\ \ BOINCDIR=[boincpath];export BOINCDIR\ -\ + +\f1 \ (2) Run Configure to create the correct config.h file:\ \ -./configure --disable-server --with-apple-opengl-framework --disable-dynamic-graphics\ -\ + +\f2 ./configure --disable-server --with-apple-opengl-framework --disable-dynamic-graphics\ + +\f1 \ (3) Copy the correct jpebglib.a into [path]/seti_boinc/jpeg/ ?????\ \ (4)Create a symbolic link [path]/seti_boinc/boinc pointing to the boinc directory\ \ -cd [boincpath]/seti_boinc \ + +\f2 cd [boincpath]/seti_boinc \ ln -s [boincpath] ./boinc\ -\ + +\f1 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc \f0\b \cf0 Building the BOINC SETI client application diff --git a/mac_installer/ReadMe.rtf b/mac_installer/ReadMe.rtf index 0ff5736279..0d69179d3f 100644 --- a/mac_installer/ReadMe.rtf +++ b/mac_installer/ReadMe.rtf @@ -4,7 +4,7 @@ \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc -\f0\b\fs28 \cf0 Macintosh BOINCManager Version 4.36 Release Notes\ +\f0\b\fs28 \cf0 Macintosh BOINCManager Version 4.37 Release Notes\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1\b0\fs24 \cf0 \