From 33c2eac95e11bab0f262f6a29d49cee248e5470e Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Wed, 6 Jan 2021 11:48:02 -0800 Subject: [PATCH] Disable mac codesign --- Makefile | 5 +++-- mac/Tasks.xcodeproj/project.pbxproj | 28 +++++++++++++++------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index a63392943..df580c192 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,9 @@ mac-app: server-mac webapp cp bin/mac/octoserver mac/resources/bin/octoserver cp -R webapp/pack mac/resources/pack mkdir -p mac/temp - xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive - xcodebuild -exportArchive -archivePath mac/temp/tasks.xcarchive -exportPath mac/dist -exportOptionsPlist mac/export.plist + xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO" + cp -R mac/temp/tasks.xcarchive/Products/Applications/Tasks.app mac/dist/ + # xcodebuild -exportArchive -archivePath mac/temp/tasks.xcarchive -exportPath mac/dist -exportOptionsPlist mac/export.plist cd mac/dist; zip -r tasks-mac.zip Tasks.app win-app: server-win webapp diff --git a/mac/Tasks.xcodeproj/project.pbxproj b/mac/Tasks.xcodeproj/project.pbxproj index cab2f3ffc..d32fefc93 100644 --- a/mac/Tasks.xcodeproj/project.pbxproj +++ b/mac/Tasks.xcodeproj/project.pbxproj @@ -274,7 +274,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.qrayon.octoserver\" --entitlement \"$PROJECT_DIR/Tasks/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/octoserver\"\n"; + shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.qrayon.octoserver\" --entitlement \"$PROJECT_DIR/Tasks/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/octoserver\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -453,9 +453,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Tasks/Tasks.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Tasks/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -464,6 +464,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Tasks; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; name = Debug; @@ -474,9 +475,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Tasks/Tasks.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Tasks/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -485,6 +486,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Tasks; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; name = Release; @@ -494,9 +496,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; INFOPLIST_FILE = TasksTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -516,9 +518,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; INFOPLIST_FILE = TasksTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -537,9 +539,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; INFOPLIST_FILE = TasksUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -557,9 +559,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HFP57A3MYB; + DEVELOPMENT_TEAM = UQ8HT4Q2XM; INFOPLIST_FILE = TasksUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)",