Title: [290961] trunk/Source/WebKit
Revision
290961
Author
commit-qu...@webkit.org
Date
2022-03-07 15:47:37 -0800 (Mon, 07 Mar 2022)

Log Message

[macCatalyst] Compilation error: WebContentProcess.xib: error: macOS xibs do not support target device type "ipad".
https://bugs.webkit.org/show_bug.cgi?id=237549
rdar://89912760

Patch by Richard Houle <rho...@apple.com> on 2022-03-07
Reviewed by Alexey Proskuryakov.

Xcode for macOS 12.5 complains that we bundle Mac XIBs inside our macCatalyst builds.

* Configurations/BaseXPCService.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (290960 => 290961)


--- trunk/Source/WebKit/ChangeLog	2022-03-07 23:08:24 UTC (rev 290960)
+++ trunk/Source/WebKit/ChangeLog	2022-03-07 23:47:37 UTC (rev 290961)
@@ -1,3 +1,15 @@
+2022-03-07  Richard Houle  <rho...@apple.com>
+
+        [macCatalyst] Compilation error: WebContentProcess.xib: error: macOS xibs do not support target device type "ipad".
+        https://bugs.webkit.org/show_bug.cgi?id=237549
+        rdar://89912760
+
+        Reviewed by Alexey Proskuryakov.
+
+        Xcode for macOS 12.5 complains that we bundle Mac XIBs inside our macCatalyst builds.
+
+        * Configurations/BaseXPCService.xcconfig:
+
 2022-03-07  Chris Dumez  <cdu...@apple.com>
 
         allow-custom-protocols-navigation sandbox flag.

Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (290960 => 290961)


--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2022-03-07 23:08:24 UTC (rev 290960)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2022-03-07 23:47:37 UTC (rev 290961)
@@ -37,8 +37,9 @@
 APP_ICON_Production = ;
 
 EXCLUDED_SOURCE_FILE_NAMES[sdk=embedded*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib MediaFormatReader.bundle;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_PLATFORM_NAME));
 EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
+EXCLUDED_SOURCE_FILE_NAMES_maccatalyst = *.xib;
 
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to