From d206d6ee94c1d2c62421de0093a46c3f07745166 Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Tue, 22 Oct 2019 02:31:18 -0700 Subject: [PATCH] Revert "Enable hardened runtime" The hardened runtime was causing issues with misc unsigned frameworks and failing CI, and also making it hard to locally debug code. Because we currently perform code signing outside of Xcode anyway by using the `codesign` utility, it's not particularly useful to embed hardened runtime in the project file itself. We just need to sign the app with `-o runtime` flag when signing it before sending over to notarization service. This reverts commit 76cb94be7d976e5e5fb15e6018881aad8aec2967. --- src/MacVim/MacVim.entitlements | 5 ----- src/MacVim/MacVim.xcodeproj/project.pbxproj | 6 ------ 2 files changed, 11 deletions(-) delete mode 100644 src/MacVim/MacVim.entitlements diff --git a/src/MacVim/MacVim.entitlements b/src/MacVim/MacVim.entitlements deleted file mode 100644 index 0c67376eba..0000000000 --- a/src/MacVim/MacVim.entitlements +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 91e391f436..292751011d 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -383,7 +383,6 @@ 90922ABC221D42F700F1E1F4 /* MMBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMBackend.h; sourceTree = ""; }; 90922ABD221D42F700F1E1F4 /* gui_macvim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gui_macvim.m; sourceTree = ""; }; 90922ABE221D42F700F1E1F4 /* MMBackend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMBackend.m; sourceTree = ""; }; - 90E2CE97235DCC550039C7AA /* MacVim.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacVim.entitlements; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -534,7 +533,6 @@ 29B97314FDCFA39411CA2CEA /* MacVim */ = { isa = PBXGroup; children = ( - 90E2CE97235DCC550039C7AA /* MacVim.entitlements */, 1D493D640C52482B00AB718C /* Executables */, 080E96DDFE201D6D7F000001 /* MacVim Source */, 29B97317FDCFA39411CA2CEA /* Resources */, @@ -988,10 +986,8 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = MacVim.entitlements; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -1023,10 +1019,8 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = MacVim.entitlements; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; - ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",