From 4c5c7b8aafdcdf7a2aa741528cc91b5db1446561 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 5 Apr 2017 16:18:35 -0400 Subject: [PATCH] Move code-signing configuration into target and fix loginhelper. --- .../project.pbxproj | 5 +- .../project.pbxproj | 6 +-- .../project.pbxproj | 51 +++++++++---------- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 882e5b84..bae7b2ab 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -3905,6 +3905,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = YES; EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a; FRAMEWORK_SEARCH_PATHS = ( @@ -4028,7 +4029,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = HL3Q45LX9N; DSTROOT = "/tmp/${PRODUCT_NAME}.dst"; @@ -4120,7 +4120,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = HL3Q45LX9N; DSTROOT = "/tmp/${PRODUCT_NAME}.dst"; @@ -4190,6 +4189,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/External/iOS\"", @@ -4225,6 +4225,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a; FRAMEWORK_SEARCH_PATHS = ( diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index e895e121..e7ca7873 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -2388,7 +2388,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = HL3Q45LX9N; @@ -2458,6 +2457,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2553,7 +2553,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = HL3Q45LX9N; @@ -2645,7 +2644,6 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = HL3Q45LX9N; @@ -2715,6 +2713,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2741,6 +2740,7 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = Source/Mac/MasterPassword.entitlements; + CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj b/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj index f793fcff..2d3326aa 100644 --- a/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj +++ b/platform-darwin/Source/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - DA3B845A1916AC5100246EEA /* AppStore-Mac */ = { + DA0974511E9587AC00F0BFE8 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -207,22 +207,21 @@ SDKROOT = macosx; SKIP_INSTALL = YES; }; - name = "AppStore-Mac"; + name = Test; }; - DA3B845B1916AC5100246EEA /* AppStore-Mac */ = { + DA0974521E9587AC00F0BFE8 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.entitlements"; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = HL3Q45LX9N; INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac.LoginHelper; - PROVISIONING_PROFILE_SPECIFIER = ""; }; - name = "AppStore-Mac"; + name = Test; }; - DAD9B5DC176299B9001835F9 /* Debug-Mac */ = { + DAD9B5DC176299B9001835F9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -281,9 +280,9 @@ SDKROOT = macosx; SKIP_INSTALL = YES; }; - name = "Debug-Mac"; + name = Debug; }; - DAD9B5DD176299B9001835F9 /* AdHoc-Mac */ = { + DAD9B5DD176299B9001835F9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -334,33 +333,31 @@ SDKROOT = macosx; SKIP_INSTALL = YES; }; - name = "AdHoc-Mac"; + name = Release; }; - DAD9B5DF176299B9001835F9 /* Debug-Mac */ = { + DAD9B5DF176299B9001835F9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.entitlements"; CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = HL3Q45LX9N; INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac.LoginHelper; - PROVISIONING_PROFILE_SPECIFIER = ""; }; - name = "Debug-Mac"; + name = Debug; }; - DAD9B5E0176299B9001835F9 /* AdHoc-Mac */ = { + DAD9B5E0176299B9001835F9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.entitlements"; CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = HL3Q45LX9N; INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac.LoginHelper; - PROVISIONING_PROFILE_SPECIFIER = ""; }; - name = "AdHoc-Mac"; + name = Release; }; /* End XCBuildConfiguration section */ @@ -368,22 +365,22 @@ DAD9B5BC176299B9001835F9 /* Build configuration list for PBXProject "MasterPassword-Mac-LoginHelper" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAD9B5DC176299B9001835F9 /* Debug-Mac */, - DAD9B5DD176299B9001835F9 /* AdHoc-Mac */, - DA3B845A1916AC5100246EEA /* AppStore-Mac */, + DAD9B5DC176299B9001835F9 /* Debug */, + DAD9B5DD176299B9001835F9 /* Release */, + DA0974511E9587AC00F0BFE8 /* Test */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = "AdHoc-Mac"; + defaultConfigurationName = Test; }; DAD9B5DE176299B9001835F9 /* Build configuration list for PBXNativeTarget "MasterPassword-Mac-LoginHelper" */ = { isa = XCConfigurationList; buildConfigurations = ( - DAD9B5DF176299B9001835F9 /* Debug-Mac */, - DAD9B5E0176299B9001835F9 /* AdHoc-Mac */, - DA3B845B1916AC5100246EEA /* AppStore-Mac */, + DAD9B5DF176299B9001835F9 /* Debug */, + DAD9B5E0176299B9001835F9 /* Release */, + DA0974521E9587AC00F0BFE8 /* Test */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = "AdHoc-Mac"; + defaultConfigurationName = Test; }; /* End XCConfigurationList section */ };