Mac uninstaller: replace all deprecated Mac APIs as of OS 10.12

This commit is contained in:
Charlie Fenton 2016-12-21 06:08:36 -08:00
parent 2da0e5cdb1
commit 640e8a9ff8
4 changed files with 629 additions and 491 deletions

View File

@ -20,8 +20,10 @@
#ifndef _MAC_UTIL_H_
#define _MAC_UTIL_H_
double getTimeSinceBoot(void);
#include <Carbon/Carbon.h>
double getTimeSinceBoot(void);
void getPathToThisApp(char* pathBuf, size_t bufSize);
void BringAppToFront();
#endif // _MAC_UTIL_H_

View File

@ -17,7 +17,6 @@
// mac_util.mm
#include "MacGUI.pch"
#include "mac_util.h"
#import <Cocoa/Cocoa.h>
@ -37,3 +36,7 @@ void getPathToThisApp(char* pathBuf, size_t bufSize) {
NSString *thePath = [main bundlePath];
strlcpy(pathBuf, [thePath UTF8String], bufSize);
}
void BringAppToFront() {
[ [NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps | NSApplicationActivateAllWindows ];
}

View File

@ -44,10 +44,10 @@
DD0052F910CA6F1D0067570C /* cs_proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD0052F710CA6F1D0067570C /* cs_proxy.cpp */; };
DD00F554176C081500850424 /* MacInstaller.icns in Resources */ = {isa = PBXBuildFile; fileRef = DD531BC50C193D3800742E50 /* MacInstaller.icns */; };
DD01B6790C16723C0023A806 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
DD01B7120C16723D0023A806 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1929D80918A2F100C31BCF /* Security.framework */; };
DD08648D19E0BE6D00994039 /* ProjectWelcomePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD08648B19E0BE6D00994039 /* ProjectWelcomePage.cpp */; };
DD0A06F50869A2D2007CD86E /* prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD344BE407C5B1670043025C /* prefs.cpp */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
DD0C5A8B0816711400CEC5D7 /* boinc.jpg in Resources */ = {isa = PBXBuildFile; fileRef = DD0C5A8A0816711400CEC5D7 /* boinc.jpg */; };
DD0D32DD1E0ABEEE00A0FBAB /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFE854A0B60CFD0009B43D9 /* AppKit.framework */; };
DD11E5B617D1A89700947975 /* MacAccessiblity.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD1907FA17D1A2F100596F03 /* MacAccessiblity.mm */; };
DD1277C4081F3E73007B5DE1 /* PostInstall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD1277C0081F3E73007B5DE1 /* PostInstall.cpp */; };
DD1277E6081F44C1007B5DE1 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
@ -279,6 +279,7 @@
DD81C820144D900B000BE61A /* rdrle.c in Sources */ = {isa = PBXBuildFile; fileRef = DD81C7DE144D900B000BE61A /* rdrle.c */; };
DD81C821144D900B000BE61A /* rdswitch.c in Sources */ = {isa = PBXBuildFile; fileRef = DD81C7DF144D900B000BE61A /* rdswitch.c */; };
DD81C822144D900B000BE61A /* rdtarga.c in Sources */ = {isa = PBXBuildFile; fileRef = DD81C7E0144D900B000BE61A /* rdtarga.c */; };
DD83028D1E07F87400B53CAC /* mac_util.mm in Sources */ = {isa = PBXBuildFile; fileRef = DDBAA9B41DF1902B004C48FD /* mac_util.mm */; };
DD85AE4B0F5D284D0031F7AC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1929D80918A2F100C31BCF /* Security.framework */; };
DD867B7510DCE77700128AB4 /* notice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1372D10DC5E8D00161D6B /* notice.cpp */; };
DD89163D0F3B182700DE5B1C /* ss_app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD89163C0F3B182700DE5B1C /* ss_app.cpp */; };
@ -1276,8 +1277,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DD0D32DD1E0ABEEE00A0FBAB /* AppKit.framework in Frameworks */,
DD01B6790C16723C0023A806 /* Carbon.framework in Frameworks */,
DD01B7120C16723D0023A806 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2984,6 +2985,7 @@
DDB9EA9717BE2C0D00651B07 /* filesys.cpp in Sources */,
DDB9EA9C17BE2C7100651B07 /* util.cpp in Sources */,
DDF5E23318B8673E005DEA6E /* uninstall.cpp in Sources */,
DD83028D1E07F87400B53CAC /* mac_util.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -3550,6 +3552,7 @@
DD3E153E0A774397007E0084 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@ -3604,6 +3607,7 @@
DD3E15410A774397007E0084 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@ -3660,6 +3664,7 @@
DD4688450C165F3C0089F500 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
INFOPLIST_FILE = "Uninstaller-Info.plist";
OTHER_LDFLAGS = (
"-framework",

File diff suppressed because it is too large Load Diff