Modified: trunk/Tools/ChangeLog (265273 => 265274)
--- trunk/Tools/ChangeLog 2020-08-05 01:41:55 UTC (rev 265273)
+++ trunk/Tools/ChangeLog 2020-08-05 01:56:26 UTC (rev 265274)
@@ -1,3 +1,18 @@
+2020-08-04 Fujii Hironori <[email protected]>
+
+ [webkitcorepy] REGRESSION(r265254): autoinstaller is failing to execute setup.py on win32 Python
+ https://bugs.webkit.org/show_bug.cgi?id=215152
+
+ Reviewed by Jonathan Bedard.
+
+ There were two problems. Win32 Python needs SYSTEMROOT environment
+ variable to run setup.py. win-inet-pton is using `_` for the
+ directory name (win_inet_pton-1.1.0).
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (Package.install): Add a new candidate directory by replacing '-'
+ with '_'. Pass through SYSTEMROOT env var.
+
2020-08-04 Wenson Hsieh <[email protected]>
Move poseAsClass() into the TestRunnerShared directory
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (265273 => 265274)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2020-08-05 01:41:55 UTC (rev 265273)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2020-08-05 01:56:26 UTC (rev 265274)
@@ -202,6 +202,7 @@
for candidate in [
os.path.join(temp_location, str(archive)),
os.path.join(temp_location, '{}-{}.{}'.format(archive.name, archive.version.major, archive.version.minor)),
+ os.path.join(temp_location, '{}-{}.{}.{}'.format(archive.name.replace('-', '_'), archive.version.major, archive.version.minor, archive.version.tiny)),
]:
if not os.path.exists(os.path.join(candidate, 'setup.py')):
continue
@@ -233,6 +234,7 @@
PATH=os.environ.get('PATH', ''),
PATHEXT=os.environ.get('PATHEXT', ''),
PYTHONPATH=install_location,
+ SYSTEMROOT=os.environ.get('SYSTEMROOT', ''),
),
stdout=devnull,
stderr=devnull,