Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: Update installer build script to eliminate unnecessary special handling of screensaver build which is no longer needed

This commit is contained in:
Charlie Fenton 2017-10-19 06:37:44 -07:00 committed by Christian Beer
parent ed9737215b
commit 0d4b868bbd
1 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mac_build/BuildMacBOINC.sh
View File

@ -31,6 +31,7 @@
# Updated 3/11/16 to remove obsolete targets MakeAppIcon_h & WaitPermissions
# Updated 3/13/16 to add -target and -setting optional arguments
# Updated 10/17/17 to fix bug when -all argument is implied but not explicitly passed
# Updated 10/19/17 Special handling of screensaver build is no longer needed
#
## This script requires OS 10.8 or later
#
@ -89,16 +90,8 @@ buildlibs=0
buildclient=0
buildzip=1
style="Deployment"
isXcode6orLater=0
unset settings
xcodeversion=`xcodebuild -version`
xcodeMajorVersion=`echo $xcodeversion | cut -d ' ' -f 2 | cut -d '.' -f 1`
if [ "$xcodeMajorVersion" -gt "5" ]; then
isXcode6orLater=1
fi
while [ $# -gt 0 ]; do
case "$1" in
-noclean ) doclean="" ; shift 1 ;;
@ -132,13 +125,7 @@ fi
## "-all" overrides "-lib" and "-client" since it includes those targets
if [ "${buildall}" = "1" ] || [ "${targets}" = "" ]; then
buildall=1
if [ $isXcode6orLater = 0 ]; then
## We can build the screensaver using our standard settings (with Garbage Collection)
targets="-target Build_All"
else
## We must modify the build settings for the screensaver only, to build it with ARC
targets="-target SetVersion -target libboinc -target gfx2libboinc -target api_libboinc -target boinc_opencl -target jpeg -target BOINC_Client -target switcher -target setprojectgrp -target cmd_boinc -target mgr_boinc -target Install_BOINC -target PostInstall -target Uninstaller -target SetUpSecurity -target AddRemoveUser -target ss_app -target gfx_switcher"
fi
targets="-target Build_All"
fi
version=`uname -r`;
@ -175,24 +162,8 @@ echo ""
SDKPATH=`xcodebuild -version -sdk macosx Path`
result=0
if [ $isXcode6orLater = 0 ]; then
## echo "Xcode version < 6"
## Build the screensaver using our standard settings (with Garbage Collection)
xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ${uselibcplusplus} ${cplusplus11dialect} "${settings[@]}"
result=$?
else
## echo "Xcode version > 5"
## We must modify the build settings for the screensaver only, to build it with ARC
xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ${uselibcplusplus} ${cplusplus11dialect} "${settings[@]}"
result=$?
if [ "${buildall}" = "1" ] || [ "${targets}" = "" ]; then
if [ $result -eq 0 ]; then
xcodebuild -project boinc.xcodeproj -target ScreenSaver -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ARCHS=x86_64 GCC_ENABLE_OBJC_GC=unsupported ${uselibcplusplus} ${cplusplus11dialect} "${settings[@]}"
result=$?
fi
fi
fi
xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ${uselibcplusplus} ${cplusplus11dialect} "${settings[@]}"
result=$?
if [ $result -eq 0 ]; then
# build ibboinc_zip.a for -all or -lib or default, where