Changeset 250330 in webkit

Timestamp:

Sep 24, 2019, 8:15:35 PM (6 years ago)

Author:

Fujii Hironori

Message:

[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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/conf/cygwin-httpd.conf (deleted)
• LayoutTests/http/conf/win-httpd-2.4-php5.conf (moved) (moved from trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf )
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (1 diff)
• Tools/Scripts/webkitpy/port/port_testcase.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-09-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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.
+
+        * 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.
+
 2019-09-24  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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.
+
+        _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.
+
 2019-09-24  Matt Lewis  <jlewis3@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1289 +1289 @@
         return ""
 
+    def _win_php_version(self):
+        root = os.environ.get('XAMPP_ROOT', 'C:\\xampp')
+        prefix = self._filesystem.join(root, 'php')
+        for version in ('5', '7'):
+            conf = self._filesystem.join(prefix, "php{}ts.dll".format(version))
+            if self._filesystem.exists(conf):
+                return "-php{}".format(version)
+        _log.error("No php?ts.dll found in {}".format(prefix))
+        return ""
+
     # We pass sys_platform into this method to make it easy to unit test.
     def _apache_config_file_name_for_platform(self, sys_platform):
-        if sys_platform == 'cygwin':
-            return 'apache' + self._apache_version() + '-httpd-win.conf'
-        if sys_platform == 'win32':
-            return 'win-httpd-' + self._apache_version() + '-php7.conf'
+        if sys_platform in ['cygwin', 'win32']:
+            return 'win-httpd-' + self._apache_version() + self._win_php_version() + '.conf'
         if sys_platform == 'darwin':
             return 'apache' + self._apache_version() + self._darwin_php_version() + '-httpd.conf'

trunk/Tools/Scripts/webkitpy/port/port_testcase.py

@@ -591 +591 @@
         port = TestWebKitPort()
         port._apache_version = lambda: '2.2'
-        self._assert_config_file_for_platform(port, 'cygwin', 'apache2.2-httpd-win.conf')
-
         self._assert_config_file_for_platform(port, 'linux2', 'apache2.2-httpd.conf')
         self._assert_config_file_for_platform(port, 'linux3', 'apache2.2-httpd.conf')
+
+        port._win_php_version = lambda: '-php7'
+        self._assert_config_file_for_platform(port, 'cygwin', 'win-httpd-2.2-php7.conf')
+        self._assert_config_file_for_platform(port, 'win32', 'win-httpd-2.2-php7.conf')
 
         port._is_redhat_based = lambda: True
@@ -606 +608 @@
 
         self._assert_config_file_for_platform(port, 'mac', 'apache2.2-httpd.conf')
-        self._assert_config_file_for_platform(port, 'win32', 'win-httpd-2.2-php7.conf')  # WinCairo uses win32. Only AppleWin port uses cygwin.
         self._assert_config_file_for_platform(port, 'barf', 'apache2.2-httpd.conf')