Title: [245635] trunk/Tools
- Revision
- 245635
- Author
- [email protected]
- Date
- 2019-05-22 12:09:30 -0700 (Wed, 22 May 2019)
Log Message
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 Jonathan Bedard.
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (245634 => 245635)
--- trunk/Tools/ChangeLog 2019-05-22 19:06:03 UTC (rev 245634)
+++ trunk/Tools/ChangeLog 2019-05-22 19:09:30 UTC (rev 245635)
@@ -1,3 +1,23 @@
+2019-05-22 Keith Rollin <[email protected]>
+
+ 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 Jonathan Bedard.
+
+ 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-22 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix WPE unit tests after r245565
Modified: trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py (245634 => 245635)
--- trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py 2019-05-22 19:06:03 UTC (rev 245634)
+++ trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/util.py 2019-05-22 19:09:30 UTC (rev 245635)
@@ -186,10 +186,15 @@
# 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
