Attachment 370418 Details for Bug 198130 – Patch

[patch] Patch

bug-198130-20190522104623.patch (text/plain), 2.37 KB, created by Keith Rollin on 2019-05-22 10:46:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-05-22 10:46:23 PDT

Size: 2.37 KB

patch

obsolete

>Subversion Revision: 245569
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 81eabc75e282715dfd8c4ee93533903066283a7f..0977f85d4921823127c1f6c44ef1a223b04c33fd 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-05-22  Keith Rollin  <krollin@apple.com>
>+
>+        Use a different variable when testing for Xcode context in generate-xcfilelists
>+        https://bugs.webkit.org/show_bug.cgi?id=198130
>+        <rdar://problem/51032752>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The generate-xcfilelists script can run stand-alone or in the context
>+        of Xcode. There are a couple of places where it helps to know which
>+        context is current. To determine the context, genreate-xfilelists
>+        checks an environment variable that should be defined only when Xcode
>+        is running. The variable chosen was XCODE_INSTALL_PATH. It turns out
>+        that this variable is not always defined. Therefore, switch to
>+        checking XCODE_PRODUCT_BUILD_VERSION.
>+
>+        * Scripts/webkitpy/generate_xcfilelists_lib/util.py:
>+        (subprocess_run):
>+        (is_running_under_xcode):
>+
> 2019-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix the build with HAVE(ACCESSIBILITY) disabled
>diff --git a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py
>index 33ffe1b256bd9f6f8e7bae1eb7636daf7dafcb88..ab636c67b220368865fb74d425315c1f40b46d24 100644
>--- a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py
>+++ b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py
>@@ -186,10 +186,15 @@ def subprocess_run(args, **kwargs):
> # Utility function to allow us to verify that we're running under Xcode or not.
> # For example, if we are not, then we need to make sure that we don't try to
> # access Xcode-specific environment variables.
>+#
>+# Note: This function use to check XCODE_INSTALL_PATH. Because if Xcode is
>+# running, it must have been installed. That's the theory, anyway. In
>+# actuality, it seems possible to install Xcode without the result having
>+# XCODE_INSTALL_PATH defined. So now we check XCODE_PRODUCT_BUILD_VERSION.
> 
> @LogEntryExitGlobal
> def is_running_under_xcode():
>-    return os.environ.get("XCODE_INSTALL_PATH")
>+    return os.environ.get("XCODE_PRODUCT_BUILD_VERSION")
> 
> 
> # An argparse.Action subclass that validates the user-provided value against a

Actions: View | Formatted Diff | Diff

Attachments on bug 198130: 370418