diff --git a/checkin_notes b/checkin_notes index abc67795aa..27b91e8280 100644 --- a/checkin_notes +++ b/checkin_notes @@ -12377,3 +12377,13 @@ David 19 Dec 2007 list_new_users.php manage_user.php sample_server_status.php + +Charlie 19 Dec 07 + - Mac: make build scripts more robust. + + mac_build/ + buildcurl.sh + buildjpeg.sh + BuildMacBOINC.sh + buildWxMac.sh + \ No newline at end of file diff --git a/mac_build/BuildMacBOINC.sh b/mac_build/BuildMacBOINC.sh index 5471852d1e..59fe089ea4 100644 --- a/mac_build/BuildMacBOINC.sh +++ b/mac_build/BuildMacBOINC.sh @@ -22,7 +22,7 @@ # ## # Script for building Macintosh BOINC Manager, Core Client and libraries -# by Charlie Fenton 12/4/07 +# by Charlie Fenton 12/19/07 # with thanks to Reinhard Prix for his assistance ## @@ -145,6 +145,8 @@ fi echo "" +export DEVELOPER_SDK_DIR="/Developer/SDKs" + xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} ${doclean} build return $? diff --git a/mac_build/buildWxMac.sh b/mac_build/buildWxMac.sh index eb81ee1901..5ada233d29 100644 --- a/mac_build/buildWxMac.sh +++ b/mac_build/buildWxMac.sh @@ -23,7 +23,7 @@ # Script to build the wxMac-2.8.7 library for BOINC as a Universal Binary # # by Charlie Fenton 7/21/06 -# Updated for wx-Mac 2.8.7 12/17/07 +# Updated for wx-Mac 2.8.7 12/19/07 # ## In Terminal, CD to the wxMac-2.8.7 directory. @@ -44,6 +44,7 @@ fi if [ "$1" != "-clean" ] && [ -f src/build/Deployment/libwx_mac_static.a ]; then echo "Deployment libwx_mac_static.a already built" else + export DEVELOPER_SDK_DIR="/Developer/SDKs" xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Deployment $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" if [ $? -ne 0 ]; then return 1; fi @@ -52,7 +53,8 @@ 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/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CPLUSPLUSFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" + export DEVELOPER_SDK_DIR="/Developer/SDKs" + xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build GCC_VERSION_ppc=4.0 MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk GCC_VERSION_i386=4.0 MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk OTHER_CPLUSPLUSFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" ## The above line does Development build for only the native architecture. ## Use line below instead for Universal Binary Development build ## xcodebuild -project src/wxWindows.xcodeproj -target static -configuration Development $doclean build MACOSX_DEPLOYMENT_TARGET_ppc=10.3 SDKROOT_ppc=/Developer/SDKs/MacOSX10.3.9.sdk MACOSX_DEPLOYMENT_TARGET_i386=10.4 SDKROOT_i386=/Developer/SDKs/MacOSX10.4u.sdk ARCHS="i386 ppc" OTHER_CPLUSPLUSFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"