[Mac] Allow internal builds to override code signing settings
Created attachment 248996 [details] Patch
Created attachment 249051 [details] Patch
Comment on attachment 249051 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249051&action=review > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6523 > + TargetAttributes = { > + CD13B46D1AB9E6BD001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; This seems unrelated. > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6782 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; Do we really need the -f check in addition to -x? UNLOCK_SCRIPT_NAME may be a little too generic. How about UNLOCK_KEYCHAIN_SCRIPT_NAME or WK_UNLOCK_KEYCHAIN_SCRIPT_NAME? > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:7954 > + CD13B46F1AB9E6BD001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B4701AB9E6BD001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B4711AB9E6BD001DEF45 /* Profiling */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Profiling; > + }; > + CD13B4721AB9E6BD001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Please get rid of these from the project file. If we don’t already have a definition of PRODUCT_NAME in Base.xcconfig, throw this one in there. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:32 > + productName = All; Probably not needed. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:27274 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; Same comments as above on -f and the build setting name. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:30502 > + CD13B4331AB9D947001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "All copy"; > + }; > + name = Debug; > + }; > + CD13B4341AB9D947001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "All copy"; > + }; > + name = Release; > + }; > + CD13B4351AB9D947001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "All copy"; > + }; > + name = Production; > + }; Remove these from the project file. If PRODUCT_NAME is not defined in Base.xcconfig, define it to be $(TARGET_NAME) there. > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:19 > + productName = "Unlock Internal Keychain"; Probably not needed > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:153 > + TargetAttributes = { > + CD13B4931AB9EE77001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; Not related. > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:204 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; -f, build setting name. > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:304 > + CD13B4941AB9EE77001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B4951AB9EE77001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B4961AB9EE77001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Put PRODUCT_NAME = $(TARGET_NAME) in Base.xcconfig if needed and delete this. > Source/WebKit/WebKit.xcodeproj/project.pbxproj:19 > + productName = "Unlock Internal Keychain"; Probably not needed. > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2057 > + TargetAttributes = { > + CD13B4651AB9E68F001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; Unrelated change. > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2220 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; -f, build setting name. > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2531 > + CD13B4661AB9E68F001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B4671AB9E68F001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B4681AB9E68F001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Move to Base.xcconfig if not already there. > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:8946 > + TargetAttributes = { > + CD13B4391AB9E5B5001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; Unrelated. > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:9396 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; -f and build setting name. > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:11166 > + CD13B43B1AB9E5B5001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B43C1AB9E5B5001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B43D1AB9E5B5001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Move to Base.xcconfig if not already there. > Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:941 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; Consider removing -f check and renaming the build setting. > Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:1352 > + CD13B4821AB9E753001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B4831AB9E753001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B4841AB9E753001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Move to Base.xcconfig. > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:294 > + TargetAttributes = { > + CD13B4741AB9E702001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; Unrelated. > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:349 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; -f and build setting name. > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:457 > + CD13B4751AB9E702001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B4761AB9E702001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; Move to an .xcconfig file. > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:750 > + TargetAttributes = { > + CD13B48D1AB9EE1F001DEF45 = { > + CreatedOnToolsVersion = 6.3; > + }; > + }; This is unrelated. > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:832 > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; -f is probably redundant and consider renaming the build setting. > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:1125 > + CD13B48E1AB9EE20001DEF45 /* Debug */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Debug; > + }; > + CD13B48F1AB9EE20001DEF45 /* Release */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Release; > + }; > + CD13B4901AB9EE20001DEF45 /* Production */ = { > + isa = XCBuildConfiguration; > + buildSettings = { > + PRODUCT_NAME = "$(TARGET_NAME)"; > + }; > + name = Production; > + }; Move to .xcconfig.
(In reply to comment #3) > Comment on attachment 249051 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=249051&action=review > > > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6523 > > + TargetAttributes = { > > + CD13B46D1AB9E6BD001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > This seems unrelated. I'll remove it. > > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:6782 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > Do we really need the -f check in addition to -x? We do. -x alone will match a directory with the executable bit set (which is basically all of them). -x & -f will only match an executable regular file. > UNLOCK_SCRIPT_NAME may be a little too generic. How about > UNLOCK_KEYCHAIN_SCRIPT_NAME or WK_UNLOCK_KEYCHAIN_SCRIPT_NAME? Sure! I'll do the same for UNLOCK_SCRIPT_PATH. > > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:7954 > > + CD13B46F1AB9E6BD001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B4701AB9E6BD001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B4711AB9E6BD001DEF45 /* Profiling */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Profiling; > > + }; > > + CD13B4721AB9E6BD001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Please get rid of these from the project file. If we don’t already have a > definition of PRODUCT_NAME in Base.xcconfig, throw this one in there. Ok. > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:32 > > + productName = All; > > Probably not needed. Ok. > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:27274 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > Same comments as above on -f and the build setting name. Ok. > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:30502 > > + CD13B4331AB9D947001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "All copy"; > > + }; > > + name = Debug; > > + }; > > + CD13B4341AB9D947001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "All copy"; > > + }; > > + name = Release; > > + }; > > + CD13B4351AB9D947001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "All copy"; > > + }; > > + name = Production; > > + }; > > Remove these from the project file. If PRODUCT_NAME is not defined in > Base.xcconfig, define it to be $(TARGET_NAME) there. Ok. > > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:19 > > + productName = "Unlock Internal Keychain"; > > Probably not needed Removed. > > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:153 > > + TargetAttributes = { > > + CD13B4931AB9EE77001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > Not related. Removed. > > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:204 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > -f, build setting name. > > > Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj:304 > > + CD13B4941AB9EE77001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B4951AB9EE77001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B4961AB9EE77001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Put PRODUCT_NAME = $(TARGET_NAME) in Base.xcconfig if needed and delete this. Removed. > > Source/WebKit/WebKit.xcodeproj/project.pbxproj:19 > > + productName = "Unlock Internal Keychain"; > > Probably not needed. Removed. > > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2057 > > + TargetAttributes = { > > + CD13B4651AB9E68F001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > Unrelated change. Removed. > > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2220 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > -f, build setting name. Ok. > > Source/WebKit/WebKit.xcodeproj/project.pbxproj:2531 > > + CD13B4661AB9E68F001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B4671AB9E68F001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B4681AB9E68F001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Move to Base.xcconfig if not already there. Removed. > > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:8946 > > + TargetAttributes = { > > + CD13B4391AB9E5B5001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > Unrelated. Removed. > > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:9396 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > -f and build setting name. Ok. > > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:11166 > > + CD13B43B1AB9E5B5001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B43C1AB9E5B5001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B43D1AB9E5B5001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Move to Base.xcconfig if not already there. Removed. > > Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:941 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > Consider removing -f check and renaming the build setting. Ok. > > Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:1352 > > + CD13B4821AB9E753001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B4831AB9E753001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B4841AB9E753001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Move to Base.xcconfig. Removed. > > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:294 > > + TargetAttributes = { > > + CD13B4741AB9E702001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > Unrelated. Removed. > > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:349 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > -f and build setting name. Ok. > > Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:457 > > + CD13B4751AB9E702001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B4761AB9E702001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > Move to an .xcconfig file. Removed. > > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:750 > > + TargetAttributes = { > > + CD13B48D1AB9EE1F001DEF45 = { > > + CreatedOnToolsVersion = 6.3; > > + }; > > + }; > > This is unrelated. Removed. > > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:832 > > + shellScript = "UNLOCK_SCRIPT_PATH=\"${SRCROOT}/../../../Internal/Tools/Scripts/${UNLOCK_SCRIPT_NAME}\"\n\n[[ -x \"${UNLOCK_SCRIPT_PATH}\" && -f \"${UNLOCK_SCRIPT_PATH}\" ]] && exec \"${UNLOCK_SCRIPT_PATH}\"\n\nexit 0"; > > -f is probably redundant and consider renaming the build setting. Ok. > > Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:1125 > > + CD13B48E1AB9EE20001DEF45 /* Debug */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Debug; > > + }; > > + CD13B48F1AB9EE20001DEF45 /* Release */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Release; > > + }; > > + CD13B4901AB9EE20001DEF45 /* Production */ = { > > + isa = XCBuildConfiguration; > > + buildSettings = { > > + PRODUCT_NAME = "$(TARGET_NAME)"; > > + }; > > + name = Production; > > + }; > > Move to .xcconfig. Removed.
Created attachment 249419 [details] Patch for landing