[webkit-changes] [WebKit/WebKit] d67f50: [Xcode] WK_WORKSPACE_DIR build setting computed in...

[Elliott Williams]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: d67f50b1bb68ec2d7f99e79461a81a18d1bbd26c
      https://github.com/WebKit/WebKit/commit/d67f50b1bb68ec2d7f99e79461a81a18d1bbd26c
  Author: Elliott Williams <emw at apple.com>
  Date:   2024-05-23 (Thu, 23 May 2024)

  Changed paths:
    M Configurations/WebKitProjectPaths.xcconfig

  Log Message:
  -----------
  [Xcode] WK_WORKSPACE_DIR build setting computed incorrectly when WebKit is checked out in a directory named "Source"
rdar://128549939
https://bugs.webkit.org/show_bug.cgi?id=274534

Reviewed by Alexey Proskuryakov.

WK_WORKSPACE_DIR is computed by walking up the file hierarchy and
looking for a "Source" or "Tools" directory to indicate that the next
parent is the root directory of the repo. But it doesn't terminate when
it finds a match. So, if there is a "Source" or "Tools" directory above
the repo, it may be found and screw up the definition of
WK_WORKSPACE_DIR. For example, if WebKit is checked out at
/Users/emw/Source/WebKit, we end up with:

    WK_WORKSPACE_DIR=/Users/emw/Source/WebKit/Users/emw

In the public build, this manifests as a failure to find the correct
additions SDK inside $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/.

Fix by rewriting the WK_WORKSPACE_DIR declaration to use ":default",
such that parent directories will only be considered if a child
directory did not match.

* Configurations/WebKitProjectPaths.xcconfig:

Canonical link: https://commits.webkit.org/279224@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications