Revert [270072@main] [Xcode] Dead webkitdirs.pm code assumes all sign…

…ing identities start with "iPhone Developer" https://bugs.webkit.org/show_bug.cgi?id=263938 rdar://96538743 Unreviewed, it broke the internal iOS build. * Source/JavaScriptCore/Configurations/DebugRelease.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig: * Source/WebKit/Configurations/DebugRelease.xcconfig: * Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig: * Tools/Scripts/webkitdirs.pm: (hasIOSDevelopmentCertificate): (XcodeOptions): * Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig: * Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig: Canonical link: https://commits.webkit.org/270144@main
WebKit · Nov 2, 2023 · ab752d9 · ab752d9
1 parent 690ddf9
commit ab752d9
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
@@ -34,9 +34,6 @@ CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
 CODE_SIGN_IDENTITY_NO = -;
 CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
 
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
 SDKROOT_ = macosx;
 SDKROOT_YES = macosx.internal;

diff --git a/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
@@ -24,11 +24,8 @@
 #include "Base.xcconfig"
 #include? "../../../../LocalOverrides.xcconfig"
 
-
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 VALID_ARCHS[sdk=watch*] = $(ARCHS_STANDARD_32_64_BIT);
+
 ONLY_ACTIVE_ARCH = YES;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

diff --git a/Source/WebKit/Configurations/DebugRelease.xcconfig b/Source/WebKit/Configurations/DebugRelease.xcconfig
@@ -33,13 +33,10 @@ SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
 SDKROOT_ = macosx;
 SDKROOT_YES = macosx.internal;
 
-CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_RESTRICTED_$(WK_USE_RESTRICTED_ENTITLEMENTS))
-CODE_SIGN_IDENTITY_RESTRICTED_ = $(CODE_SIGN_IDENTITY_RESTRICTED_NO);
-CODE_SIGN_IDENTITY_RESTRICTED_NO = -;
-CODE_SIGN_IDENTITY_RESTRICTED_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
-
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
+CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(WK_USE_RESTRICTED_ENTITLEMENTS))
+CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
+CODE_SIGN_IDENTITY_NO = -;
+CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
 
 VALIDATE_DEPENDENCIES = $(VALIDATE_DEPENDENCIES_INTERNAL_$(USE_INTERNAL_SDK));
 VALIDATE_DEPENDENCIES_INTERNAL_ = $(VALIDATE_DEPENDENCIES_NATIVE_TARGET_$(WK_NOT_$(WK_EMPTY_$(PRODUCT_TYPE))));

diff --git a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
@@ -31,9 +31,6 @@ CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
 CODE_SIGN_IDENTITY_NO = -;
 CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
 
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
 SDKROOT_ = macosx;
 SDKROOT_YES = macosx.internal;

diff --git a/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig b/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig
@@ -24,9 +24,6 @@
 #include "Base.xcconfig"
 #include? "../../../LocalOverrides.xcconfig"
 
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 ONLY_ACTIVE_ARCH = YES;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
@@ -1189,6 +1189,11 @@ sub determineGenerateDsym()
     $generateDsym = checkForArgumentAndRemoveFromARGV("--dsym");
 }
 
+sub hasIOSDevelopmentCertificate()
+{
+    return !exitStatus(system("security find-identity -p codesigning | grep '" . IOS_DEVELOPMENT_CERTIFICATE_NAME_PREFIX . "' > /dev/null 2>&1"));
+}
+
 sub argumentsForXcode()
 {
     my @args = ();
@@ -1275,6 +1280,15 @@ sub XcodeOptions
     die "Cannot enable both ASAN and TSAN at the same time\n" if $asanIsEnabled && $tsanIsEnabled;
     die "Cannot enable both (ASAN or TSAN) and Coverage at this time\n" if $coverageIsEnabled && ($asanIsEnabled || $tsanIsEnabled);
 
+    if (willUseIOSDeviceSDK() || willUseWatchDeviceSDK() || willUseAppleTVDeviceSDK()) {
+        if (hasIOSDevelopmentCertificate()) {
+            # FIXME: May match more than one installed development certificate.
+            push @options, "CODE_SIGN_IDENTITY=" . IOS_DEVELOPMENT_CERTIFICATE_NAME_PREFIX;
+        } else {
+            push @options, "CODE_SIGN_IDENTITY="; # No identity
+            push @options, "CODE_SIGNING_REQUIRED=NO";
+        }
+    }
     push @options, argumentsForXcode();
     return @options;
 }

diff --git a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
@@ -24,9 +24,6 @@
 #include "Base.xcconfig"
 #include? "../../../LocalOverrides.xcconfig"
 
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 ONLY_ACTIVE_ARCH = YES;
 
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));

diff --git a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
@@ -24,9 +24,6 @@
 #include "Base.xcconfig"
 #include? "../../../LocalOverrides.xcconfig"
 
-CODE_SIGN_IDENTITY[sdk=embedded] = $(CODE_SIGN_IDENTITY_EMBEDDED_$(USE_INTERNAL_SDK));
-CODE_SIGN_IDENTITY_EMBEDDED_YES = $(inherited);
-
 ONLY_ACTIVE_ARCH = YES;
 
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));