Diff
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-12-23 17:29:31 UTC (rev 287399)
@@ -3497,7 +3497,6 @@
31CD00CE2491974C00486F27 /* CopyFiles */,
31CD00CF2491976800486F27 /* CopyFiles */,
31CD00D2249197FD00486F27 /* Adjust ANGLE Paths */,
- 6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
31A9E9A0249AA04200C7E243 /* PBXBuildRule */,
@@ -3586,25 +3585,6 @@
shellPath = /bin/sh;
shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\n exit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.py\"\n";
};
- 6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- name = "Create Symlink to Alt Root Path";
- outputFileListPaths = (
- );
- outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/zsh;
- shellScript = "\"${SRCROOT}/scripts/create-symlink-to-altroot.sh\"\n";
- };
FFDA50D5269F895400AE11E2 /* Bake Metal Library to NSData */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 17:29:31 UTC (rev 287399)
@@ -1,3 +1,54 @@
+2021-12-23 Alan Coon <[email protected]>
+
+ Cherry-pick r287326. rdar://problem/86855216
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Source/ThirdParty/ANGLE:
+
+ Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/WebCore:
+
+ Covered by existing tests.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Source/WebGPU:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebGPU.xcodeproj/project.pbxproj:
+
+ Source/WebInspectorUI:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-21 Michael Saboff <[email protected]>
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2021-12-16 Alan Coon <[email protected]>
Cherry-pick r287137. rdar://problem/86476583
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 17:29:31 UTC (rev 287399)
@@ -30,11 +30,6 @@
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
-ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
-
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
-
HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google ${DERIVED_FILES_DIR};
ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
Modified: branches/safari-613.1.12-branch/Source/WebCore/ChangeLog (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:29:31 UTC (rev 287399)
@@ -1,3 +1,55 @@
+2021-12-23 Alan Coon <[email protected]>
+
+ Cherry-pick r287326. rdar://problem/86855216
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Source/ThirdParty/ANGLE:
+
+ Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/WebCore:
+
+ Covered by existing tests.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Source/WebGPU:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebGPU.xcodeproj/project.pbxproj:
+
+ Source/WebInspectorUI:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-21 Michael Saboff <[email protected]>
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Covered by existing tests.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2021-12-16 Alan Coon <[email protected]>
Cherry-pick r287137. rdar://problem/86476583
Modified: branches/safari-613.1.12-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-12-23 17:29:31 UTC (rev 287399)
@@ -38225,9 +38225,9 @@
);
name = "Create Symlink to Alt Root Path";
outputFileListPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
outputPaths = (
+ "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
Modified: branches/safari-613.1.12-branch/Source/WebGPU/ChangeLog (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebGPU/ChangeLog 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebGPU/ChangeLog 2021-12-23 17:29:31 UTC (rev 287399)
@@ -1,3 +1,53 @@
+2021-12-23 Alan Coon <[email protected]>
+
+ Cherry-pick r287326. rdar://problem/86855216
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Source/ThirdParty/ANGLE:
+
+ Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/WebCore:
+
+ Covered by existing tests.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Source/WebGPU:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebGPU.xcodeproj/project.pbxproj:
+
+ Source/WebInspectorUI:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-21 Michael Saboff <[email protected]>
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebGPU.xcodeproj/project.pbxproj:
+
2021-12-16 Alan Coon <[email protected]>
Cherry-pick r287137. rdar://problem/86476583
Modified: branches/safari-613.1.12-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2021-12-23 17:29:31 UTC (rev 287399)
@@ -443,9 +443,9 @@
);
name = "Create Symlink to Alt Root Path";
outputFileListPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
outputPaths = (
+ "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
Modified: branches/safari-613.1.12-branch/Source/WebInspectorUI/ChangeLog (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebInspectorUI/ChangeLog 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebInspectorUI/ChangeLog 2021-12-23 17:29:31 UTC (rev 287399)
@@ -1,3 +1,53 @@
+2021-12-23 Alan Coon <[email protected]>
+
+ Cherry-pick r287326. rdar://problem/86855216
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Source/ThirdParty/ANGLE:
+
+ Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/WebCore:
+
+ Covered by existing tests.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Source/WebGPU:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebGPU.xcodeproj/project.pbxproj:
+
+ Source/WebInspectorUI:
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-21 Michael Saboff <[email protected]>
+
+ Fix symlinks for alternate root framework locations
+ https://bugs.webkit.org/show_bug.cgi?id=234567
+
+ Reviewed by Filip Pizlo.
+
+ Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
2021-12-16 Alan Coon <[email protected]>
Cherry-pick r287137. rdar://problem/86476583
Modified: branches/safari-613.1.12-branch/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (287398 => 287399)
--- branches/safari-613.1.12-branch/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2021-12-23 17:23:20 UTC (rev 287398)
+++ branches/safari-613.1.12-branch/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2021-12-23 17:29:31 UTC (rev 287399)
@@ -159,9 +159,9 @@
);
name = "Create Symlink to Alt Root Path";
outputFileListPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
outputPaths = (
+ "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
