Title: [295752] trunk/Source
- Revision
- 295752
- Author
- e...@apple.com
- Date
- 2022-06-22 15:44:36 -0700 (Wed, 22 Jun 2022)
Log Message
[XCBuild] Fix validation errors caused by copying to symlink framework bundle directories
Unreviewed build fix.
Prefix a few destination paths with $(WK_FRAMEWORK_VERSION_PREFIX). The
build system needs to know the real paths these items are copied to for
it to be able to schedule them ahead of tasks which depend on them.
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj: Remove
"Copy Mig Files into Private Framework Headers" because it has no
members. The files were removed in
https://bugs.webkit.org/show_bug.cgi?id=232462.
Canonical link: https://commits.webkit.org/251757@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (295751 => 295752)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-06-22 22:44:36 UTC (rev 295752)
@@ -5875,7 +5875,7 @@
3717D7E717ECC573003C276D /* Copy Scripts */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = PrivateHeaders/Scripts;
+ dstPath = "$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders/Scripts";
dstSubfolderSpec = 1;
files = (
F4BFB9851E1DDF9B00862C24 /* DumpEditingHistory.js in Copy Scripts */,
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295751 => 295752)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-06-22 22:44:36 UTC (rev 295752)
@@ -2668,7 +2668,7 @@
1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = PrivateHeaders/Scripts/webkit;
+ dstPath = "$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders/Scripts/webkit";
dstSubfolderSpec = 1;
files = (
1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (295751 => 295752)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2022-06-22 22:42:57 UTC (rev 295751)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2022-06-22 22:44:36 UTC (rev 295752)
@@ -722,19 +722,6 @@
};
/* End PBXContainerItemProxy section */
-/* Begin PBXCopyFilesBuildPhase section */
- 535E08CB2254637200DF00CA /* Copy Mig Files into Private Framework Headers */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = PrivateHeaders;
- dstSubfolderSpec = 1;
- files = (
- );
- name = "Copy Mig Files into Private Framework Headers";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
/* Begin PBXFileReference section */
065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebContextMenuClient.h; sourceTree = "<group>"; };
065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; };
@@ -3169,7 +3156,6 @@
7C02321B251B9A8A00BA7BB6 /* Generate Preferences */,
9398100D0824BF01008DF038 /* Headers */,
DDF74CA027EE3E990011F633 /* (Legacy) Install Headers */,
- 535E08CB2254637200DF00CA /* Copy Mig Files into Private Framework Headers */,
939810B20824BF01008DF038 /* Resources */,
1C395DE20C6BE8E0000D1E52 /* Generate Export Files */,
939810BB0824BF01008DF038 /* Sources */,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
