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

Merge pull request #4115 from BOINC/mac_fixes_for_Xcode_12_2 

Mac: Fixes for building with Xcode 12.2
This commit is contained in:
David Anderson 2020-12-01 16:07:14 -08:00 committed by GitHub
parent fb2b5a7054 c02868a47c
commit 1a64d5d717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 69 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mac_build/HowToBuildBOINC_XCode.pdf
View File

Binary file not shown.

37
mac_build/HowToBuildBOINC_XCode.rtf
View File

@ -14,10 +14,10 @@
\b0\fs24 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\partightenfactor0
\cf0 Written by Charlie Fenton\
Last updated 7/15/20\
Last updated 12/1/20\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\cf0 \
This document applies to BOINC version 7.17.0 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \
This document applies to BOINC version 7.16.14 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
@ -61,7 +61,7 @@ Contents of this document:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\cf0 \
\pard\pardeftab720\sa260\partightenfactor0
\cf0 As of version 6.13.0, BOINC does not support Macintosh PowerPC processors. As of 7.15.0, BOINC is built entirely for 64-bit Intel, including the BOINC libraries.\
\cf0 As of version 6.13.0, BOINC does not support Macintosh PowerPC processors. As of 7.15.0, BOINC is built entirely for 64-bit Intel, including the BOINC libraries. As of 7.16.14, BOINC is built as Universal2 Binaries which can run on both 64-bit Intel and Apple Silicon (arm64) hardware. \
You need to take certain steps to ensure that you use only APIs that are available in all the OS versions BOINC supports for each architecture. The best way to accomplish this is to use a single development system running OS 10.8.x or later and cross-compile for the various platforms. The remainder of this document describes that process.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 \
@ -74,7 +74,7 @@ You need to take certain steps to ensure that you use only APIs that are availab
\cf0 Be sure to follow the directions in this document to ensure that these requirements are met.\
\
\pard\pardeftab720\sa260\partightenfactor0
\cf0 Starting with version 7.15.0, the BOINC screensaver supports only Mac OS 10.7.0 and later.\
\cf0 Starting with version 7.16.14, the BOINC screensaver supports only Mac OS 10.9.0 and later.\
\pard\pardeftab720\sa260\qc\partightenfactor0
\b\fs28 \cf0 Cross-Platform Development
@ -164,11 +164,11 @@ ftgl-2.1.3~rc5 (needed only if you are building the BOINC default screensaver o
\f0\fs24 \cf0 \
\pard\pardeftab720\sa260\partightenfactor0
\cf0 XCode will automatically check compatibility back to OS 10.7 if the following are defined during compilation:\
\cf0 XCode will automatically check compatibility back to OS 10.9 if the following are defined during compilation:\
\pard\pardeftab720\partightenfactor0
\f1\fs26 \cf0 MAC_OS_X_VERSION_MAX_ALLOWED=1070\
MAC_OS_X_VERSION_MIN_REQUIRED=1070\
\f1\fs26 \cf0 MAC_OS_X_VERSION_MAX_ALLOWED=1090\
MAC_OS_X_VERSION_MIN_REQUIRED=1090\
\pard\pardeftab720\partightenfactor0
\f0\fs24 \cf0 \
@ -267,12 +267,12 @@ If you don't wish to force a full rebuild of everything, omit the -clean argumen
\b0 You don't need to type the path to a file or folder into Terminal; just drag the file or folder icon from a Finder window onto the Terminal window.\
\b Note 5:
\b0 To be compatible with OS 10.7, the screensaver must be built with Garbage Collection (GC) supported (and without Automatic Reference Counting) , but Xcode versions later than 5.0.2 do not allow building with GC. To allow building with newer versions of Xcode while keeping backward compatibility to OS 10.7, the GIT repository includes the screensaver executable built with GC, while the Xcode project builds the screensaver with ARC (for newer versions of OS X.) The
\b0 To be compatible with OS 10.7 or earlier, the screensaver must be built with Garbage Collection (GC) supported (and without Automatic Reference Counting) , but Xcode versions later than 5.0.2 do not allow building with GC. To allow building with newer versions of Xcode while keeping backward compatibility to OS 10.7, the GIT repository includes the screensaver executable built with GC, while the Xcode project builds the screensaver with ARC (for newer versions of OS X.) The
\f1\fs26 release_boinc.sh
\f0\fs24 script (described later in this document) adds both the GC and ARC builds of the screensaver to the installer; the installer code selects the correct screensaver for the target version of OS X at install time.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\cf0 \
[6] Build BOINC as follows:\
\cf0 [6] Build BOINC as follows:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf0 BOINC itself is built using the
@ -415,7 +415,7 @@ The installer script uses the deployment (release) build of BOINC; it won't work
You can find the current version number in the file
\f1\fs26 \{path\}/BOINC_dev/boinc/version.h
\fs24 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\pard\pardeftab720\partightenfactor0
\f4 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\partightenfactor0
@ -452,7 +452,17 @@ Developer ID Application: John Smith\
\f1\fs26 ~/BOINCCodeSignIdentities.txt
\f0\fs24 file, then the script will not sign the installer or uninstaller. Code signing is not necessary if you won't be transferring the built software over the Internet. For more information on code signing identities see the documentation for the {\field{\*\fldinst{HYPERLINK "https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/codesign.1.html"}}{\fldrslt
\f1\fs26 codesign}} utility, Apple's {\field{\*\fldinst{HYPERLINK "https://developer.apple.com/library/mac/documentation/Security/Conceptual/CodeSigningGuide/"}}{\fldrslt Code Signing Guide}} and {\field{\*\fldinst{HYPERLINK "https://developer.apple.com/library/content/technotes/tn2206/_index.htm"}}{\fldrslt Tech Note 2206}}.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\f4 \cf0 \
\pard\pardeftab720\partightenfactor0
\f0\b \cf0 Important:
\b0 Code signed under MacOS 11.0 or later is not compatible with MacOS 10.11.6 or earlier and will be rejected with "Signature invalid." If backward compatibility is desired to allow installing and running on systems prior to MacOS 10.12.0, run the
\f1\fs26 release_boinc.sh
\f0\fs24 script under MacOS 10.15.7 or earlier. You can do this even if you performed the previous steps under MacOS 11.0 or later.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\partightenfactor0
\b\fs28 \cf0 Debugging and BOINC security
@ -491,6 +501,9 @@ To restore the standard ownerships and permissions, run the installer or run the
\cf0 \
If Xcode is obtained from the Apple Store then it will be installed automatically into the Applications folder. Double-click on the installed Xcode icon to run Xcode. Xcode will display a dialog allowing you to finish the installation; you must do this before running BOINC's build scripts. (Some versions of Xcode may not display this dialog until you open a file with Xcode.)\
\
====================== Additional notes from \expnd0\expndtw0\kerning0
Robert Chalmers\kerning1\expnd0\expndtw0 ======================\
\
NOTE to building with XCode.\
The general instructions in the mac_build folder in the file HowToBuildBOINC_XCode.pdf should also note that if you want to build using XCode in it's GUI implementation - not command line - alone, you need to put all the downloaded libraries in the folder directly above the build folder. For EG:\
All of these external programs:\

18
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -3805,6 +3805,15 @@
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = "Installer-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-D_THREAD_SAFE",
"-D_DEBUG",
"-DDeployment_target=\\\"$MACOSX_DEPLOYMENT_TARGET\\\"",
"-DSANDBOX",
"-include",
../clientgui/mac/config.h,
);
OTHER_LDFLAGS = (
"-framework",
Carbon,
@ -3818,6 +3827,15 @@
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = "Installer-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-D_THREAD_SAFE",
"-DNDEBUG",
"-DDeployment_target=\\\"$MACOSX_DEPLOYMENT_TARGET\\\"",
"-DSANDBOX",
"-include",
../clientgui/mac/config.h,
);
OTHER_LDFLAGS = (
"-framework",
Carbon,

10
mac_installer/Installer.cpp
View File

@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2018 University of California
// Copyright (C) 2020 University of California
//
// BOINC is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License
@ -86,6 +86,8 @@ int main(int argc, char *argv[])
FILE *restartNeededFile;
FILE *f;
long oldBrandID;
int major = 0;
int minor = 0;
if (!check_branding_arrays(temp, sizeof(temp))) {
ShowMessage((char *)_("Branding array has too few entries: %s"), temp);
@ -209,13 +211,15 @@ int main(int argc, char *argv[])
if (err == noErr) {
GetPreferredLanguages();
}
if (compareOSVersionTo(10, 7) < 0) {
sscanf(Deployment_target, "%i.%i", &major, &minor);
if (compareOSVersionTo(major, minor) < 0) {
LoadPreferredLanguages();
BringAppToFront();
p = strrchr(brand, ' '); // Strip off last space character and everything following
if (p)
*p = '\0';
ShowMessage((char *)_("Sorry, this version of %s requires system 10.7 or higher."), brand);
ShowMessage((char *)_("Sorry, this version of %s requires system %s or higher."), brand, Deployment_target);
snprintf(temp, sizeof(temp), "rm -dfR /tmp/%s/BOINC_payload", tempDirName);
err = callPosixSpawn(temp);

4
mac_installer/ReadMe.rtf
View File

@ -11,10 +11,10 @@
\b0\fs24 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\partightenfactor0
\cf0 http://boinc.berkeley.edu/\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
\b \cf0 Installing BOINC may take several minutes; please be patient.
\b \cf0 <MINOSVERS>\
Installing BOINC may take several minutes; please be patient.
\b0 \
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0

17
mac_installer/release_boinc.sh
View File

@ -52,6 +52,7 @@
## updated 3/4/20 by Charlie Fenton to copy symbol tables directly from build
## Updated 7/29/20 by Charlie Fenton to build arm64 and x86_64 Universal2 Binary
## Updated 11/22/20 by Charlie Fenton to build DMG bare-core (apple-darwin) release
## Updated 11/26/20 by Charlie Fenton to let installer show message if MacOS too old
##
## NOTE: This script requires Mac OS 10.7 or later, and uses XCode developer
## tools. So you must have installed XCode Developer Tools on the Mac
@ -240,6 +241,18 @@ cp -fp mac_installer/myDistribution ../BOINC_Installer/Installer\ templates
sed -i "" s/"<VER_NUM>"/"$1.$2.$3"/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf
sed -i "" s/"x.y.z"/"$1.$2.$3"/g ../BOINC_Installer/Installer\ templates/myDistribution
## Add a statement in the ReadMe telling Minimum required MacOS version, if known
OSVersion=`/usr/libexec/PlistBuddy -c "Print :LSMinimumSystemVersion" "${BUILDPATH}/BOINCManager.app/Contents/Info.plist"`
if [ $? -eq 0 ]; then
sed -i "" s/"<MINOSVERS>"/"^#NOTE: This version of BOINC requires MacOS <OSVERS> or later.^#"/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf
tr "^#" "\\\\\n" < ../BOINC_Installer/Installer\ Resources/ReadMe.rtf > /tmp/ReadMe.rtf
cp -f /tmp/ReadMe.rtf ../BOINC_Installer/Installer\ Resources/ReadMe.rtf
sed -i "" s/"<OSVERS>"/"$OSVersion"/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf
else
sed -i "" s/"<MINOSVERS>"/""/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf
fi
#### We don't customize BOINC Data directory name for branding
cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Scripts/
cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Scripts/preupgrade
@ -351,6 +364,10 @@ sudo chmod -R u+r-w,g+r-w,o+r-w ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1
# Copy the installer wrapper application "BOINC Installer.app"
cp -fpRL "${BUILDPATH}/BOINC Installer.app" ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/
## Allow the installer wrapper application to run on older versions of MacOS
## so it can display an appropriate error message.
/usr/libexec/PlistBuddy -c "Set :LSMinimumSystemVersion 10.0" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Info.plist"
cp -fpR "${BUILDPATH}/PostInstall.app" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources"