Title: [291192] trunk/Source
- Revision
- 291192
- Author
- e...@apple.com
- Date
- 2022-03-11 14:30:31 -0800 (Fri, 11 Mar 2022)
Log Message
[Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
https://bugs.webkit.org/show_bug.cgi?id=237793
Reviewed by Alexey Proskuryakov.
Source/WebCore/PAL:
* PAL.xcodeproj/project.pbxproj:
Source/WTF:
SDK_VARIANT needs to be passed into the nested `xcodebuild` invocation that these script
phases run. Pass WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO to prevent the default behavior where
Catalyst content is installed to /System/iOSSupport, as this causes headers to be copied to
WebKitBuild/Release/System/iOSSupport/...
This script phases only run under the legacy build system, so they do not affect production
builds. https://commits.webkit.org/247656@main provides more context on this hack (tl;dr
it's a temporary workaround for the XCBuild migration).
* WTF.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (291191 => 291192)
--- trunk/Source/WTF/ChangeLog 2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WTF/ChangeLog 2022-03-11 22:30:31 UTC (rev 291192)
@@ -1,3 +1,21 @@
+2022-03-11 Elliott Williams <e...@apple.com>
+
+ [Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=237793
+
+ Reviewed by Alexey Proskuryakov.
+
+ SDK_VARIANT needs to be passed into the nested `xcodebuild` invocation that these script
+ phases run. Pass WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO to prevent the default behavior where
+ Catalyst content is installed to /System/iOSSupport, as this causes headers to be copied to
+ WebKitBuild/Release/System/iOSSupport/...
+
+ This script phases only run under the legacy build system, so they do not affect production
+ builds. https://commits.webkit.org/247656@main provides more context on this hack (tl;dr
+ it's a temporary workaround for the XCBuild migration).
+
+ * WTF.xcodeproj/project.pbxproj:
+
2022-03-10 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Add a unit tests to check the remote inspector HTTP server
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (291191 => 291192)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2022-03-11 22:30:31 UTC (rev 291192)
@@ -3521,7 +3521,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" -UseNewBuildSystem=YES\n\n";
+ shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" SDK_VARIANT=\"${SDK_VARIANT}\" WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO -UseNewBuildSystem=YES\n\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebCore/PAL/ChangeLog (291191 => 291192)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-03-11 22:30:31 UTC (rev 291192)
@@ -1,3 +1,12 @@
+2022-03-11 Elliott Williams <e...@apple.com>
+
+ [Xcode] "Nest Headers" script phases copy headers incorrectly on Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=237793
+
+ Reviewed by Alexey Proskuryakov.
+
+ * PAL.xcodeproj/project.pbxproj:
+
2022-03-08 Jean-Yves Avenard <j...@apple.com>
Split SourceBufferParserWebM and have platform agnostic WebMParser
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (291191 => 291192)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-03-11 22:22:51 UTC (rev 291191)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-03-11 22:30:31 UTC (rev 291192)
@@ -2049,7 +2049,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" -UseNewBuildSystem=YES\n";
+ shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" SDK_VARIANT=\"${SDK_VARIANT}\" WK_USE_ALTERNATE_FRAMEWORKS_DIR=NO -UseNewBuildSystem=YES\n";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
