[Windows][webkitpy] _apache_config_file_name_for_platform should take the system...
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Sep 2019 03:15:35 +0000 (03:15 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Sep 2019 03:15:35 +0000 (03:15 +0000)
commit37ab1d61a47036bd6e5897766c9bd1ecd320ccc6
tree07ea7cc32080e81efdf93f400a9a0424127aa088
parent9cdc11688d6fd3c519d822d9ad1e193d5d433a4c
[Windows][webkitpy] _apache_config_file_name_for_platform should take the system PHP version into account
https://bugs.webkit.org/show_bug.cgi?id=202134

Reviewed by Jonathan Bedard.

Tools:

_apache_config_file_name_for_platform always returns a config file
name for PHP5 on Cygwin Python, one for PHP7 on Win32 Python. It
should detect the system PHP version as Linux ports do.

Both AppleWin and WinCairo are using XAMPP Apache. Unify the code
paths for them. And, remove a stale conf file.

This change makes it possible to use Cygwin Python with PHP7.

* Scripts/webkitpy/port/base.py:
(Port._win_php_version): Added.
(Port._apache_config_file_name_for_platform): Unified cygwin and
win32 code path by using _win_php_version.
* Scripts/webkitpy/port/port_testcase.py:
(test_apache_config_file_name_for_platform): Updated cygwin and
win32 test cases.

LayoutTests:

* http/conf/cygwin-httpd.conf: Removed a stale conf file.
* http/conf/win-httpd-2.4-php5.conf: Renamed from LayoutTests/http/conf/apache2.4-httpd-win.conf.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/http/conf/cygwin-httpd.conf [deleted file]
LayoutTests/http/conf/win-httpd-2.4-php5.conf [moved from LayoutTests/http/conf/apache2.4-httpd-win.conf with 100% similarity]
Tools/ChangeLog
Tools/Scripts/webkitpy/port/base.py
Tools/Scripts/webkitpy/port/port_testcase.py