Changeset 287326 in webkit

Timestamp:

Dec 21, 2021, 12:16:05 PM (4 years ago)

Author:

msaboff@apple.com

Message:

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:

Location:

trunk/Source

Files:

• ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (modified) (2 diffs)
• ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebGPU/ChangeLog (modified) (1 diff)
• WebGPU/WebGPU.xcodeproj/project.pbxproj (modified) (1 diff)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

@@ -3509 +3509 @@
                                 31CD00CF2491976800486F27 /* CopyFiles */,
                                 31CD00D2249197FD00486F27 /* Adjust ANGLE Paths */,
-                                6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */,
                         );
                         buildRules = (
@@ -3597 +3596 @@
                         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 */ = {

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-12-21  Michael Saboff  <msaboff@apple.com>
+
+        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-21  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig

@@ -31 +31 @@
 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};
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-21  Michael Saboff  <msaboff@apple.com>
+
+        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-21  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -38333 +38333 @@
                         name = "Create Symlink to Alt Root Path";
                         outputFileListPaths = (
+                        );
+                        outputPaths = (
                                 "${OUTPUT_ALTERNATE_ROOT_PATH}",
-                        );
-                        outputPaths = (
                         );
                         runOnlyForDeploymentPostprocessing = 1;

trunk/Source/WebGPU/ChangeLog

@@ +1 @@
+2021-12-21  Michael Saboff  <msaboff@apple.com>
+
+        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  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj

@@ -444 +444 @@
                         name = "Create Symlink to Alt Root Path";
                         outputFileListPaths = (
+                        );
+                        outputPaths = (
                                 "${OUTPUT_ALTERNATE_ROOT_PATH}",
-                        );
-                        outputPaths = (
                         );
                         runOnlyForDeploymentPostprocessing = 1;

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-12-21  Michael Saboff  <msaboff@apple.com>
+
+        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  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj

@@ -160 +160 @@
                         name = "Create Symlink to Alt Root Path";
                         outputFileListPaths = (
+                        );
+                        outputPaths = (
                                 "${OUTPUT_ALTERNATE_ROOT_PATH}",
-                        );
-                        outputPaths = (
                         );
                         runOnlyForDeploymentPostprocessing = 1;