Title: [273331] trunk/Tools
- Revision
- 273331
- Author
- [email protected]
- Date
- 2021-02-23 13:36:07 -0800 (Tue, 23 Feb 2021)
Log Message
Pass full environment when auto installing a Python module on Windows
https://bugs.webkit.org/show_bug.cgi?id=221109
<rdar://problem/74002781>
Reviewed by Jonathan Bedard.
On Python 3 when the AutoInstall routine attempted to setup markupsafe-2.0.0 it would fail
when compiling native code. When compiling outside of Visual Studio there is a batch file
that sets up the environment. This adds a large number of environment variables which could
potentially change over time so to be safe the complete environment is passed to the
setup.py installation routine for Windows only.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(Package.install):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (273330 => 273331)
--- trunk/Tools/ChangeLog 2021-02-23 20:19:23 UTC (rev 273330)
+++ trunk/Tools/ChangeLog 2021-02-23 21:36:07 UTC (rev 273331)
@@ -1,3 +1,20 @@
+2021-02-23 Don Olmstead <[email protected]>
+
+ Pass full environment when auto installing a Python module on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=221109
+ <rdar://problem/74002781>
+
+ Reviewed by Jonathan Bedard.
+
+ On Python 3 when the AutoInstall routine attempted to setup markupsafe-2.0.0 it would fail
+ when compiling native code. When compiling outside of Visual Studio there is a batch file
+ that sets up the environment. This adds a large number of environment variables which could
+ potentially change over time so to be safe the complete environment is passed to the
+ setup.py installation routine for Windows only.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (Package.install):
+
2021-02-23 Commit Queue <[email protected]>
Unreviewed, reverting r273307.
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (273330 => 273331)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-23 20:19:23 UTC (rev 273330)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-23 21:36:07 UTC (rev 273331)
@@ -290,6 +290,11 @@
PATHEXT=os.environ.get('PATHEXT', ''),
PYTHONPATH=install_location,
SYSTEMROOT=os.environ.get('SYSTEMROOT', ''),
+ ) if not sys.platform.startswith('win')
+ else dict(
+ # Windows setuptools needs environment from vcvars
+ os.environ,
+ PYTHONPATH=install_location,
),
stdout=devnull,
stderr=devnull,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
