Changeset 82770 in webkit

Timestamp:

Apr 2, 2011 4:18:57 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-04-02 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Emulate shebang on Win32
​https://bugs.webkit.org/show_bug.cgi?id=55927

Scripts on Windows work only if they are called with the explicit interpreter.
Read the first line of scripts to detect the correct executable.

• Scripts/webkitpy/common/config/ports.py:
• Scripts/webkitpy/common/system/executive.py: Added interpreter_for_script().
• Scripts/webkitpy/common/system/executive_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (2 diffs)
• Scripts/webkitpy/common/system/executive.py (modified) (2 diffs)
• Scripts/webkitpy/common/system/executive_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-02  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Emulate shebang on Win32
+        https://bugs.webkit.org/show_bug.cgi?id=55927
+
+        Scripts on Windows work only if they are called with the explicit interpreter.
+        Read the first line of scripts to detect the correct executable.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        * Scripts/webkitpy/common/system/executive.py: Added interpreter_for_script().
+        * Scripts/webkitpy/common/system/executive_unittest.py:
+
 2011-04-01  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -31 +31 @@
 import os
 import platform
+import sys
 
 from webkitpy.common.system.executive import Executive
@@ -44 +45 @@
     @classmethod
     def script_shell_command(cls, script_name):
-        return [cls.script_path(script_name)]
+        script_path = cls.script_path(script_name)
+        # Win32 does not support shebang. We need to detect the interpreter ourself.
+        if sys.platform == 'win32':
+            interpreter = Executive.interpreter_for_script(script_path)
+            if interpreter:
+                return [interpreter, script_path]
+        return [script_path]
 
     @staticmethod

trunk/Tools/Scripts/webkitpy/common/system/executive.py

@@ -46 +46 @@
 
 from webkitpy.common.system.deprecated_logging import tee
+from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.python24 import versioning
 
@@ -179 +180 @@
         # machines.
         return 2
+
+    @staticmethod
+    def interpreter_for_script(script_path, fs=FileSystem()):
+        lines = fs.read_text_file(script_path).splitlines()
+        if not len(lines):
+            return None
+        first_line = lines[0]
+        if not first_line.startswith('#!'):
+            return None
+        if first_line.find('python') > -1:
+            return sys.executable
+        if first_line.find('perl') > -1:
+            return 'perl'
+        if first_line.find('ruby') > -1:
+            return 'ruby'
+        return None
 
     def kill_process(self, pid):

trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -35 +35 @@
 
 from webkitpy.common.system.executive import Executive, run_command, ScriptError
+from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.test import cat, echo
 
@@ -65 +66 @@
 
 class ExecutiveTest(unittest.TestCase):
+
+    def assert_interpreter_for_content(self, intepreter, content):
+        fs = MockFileSystem()
+        file_path = None
+        file_interpreter = None
+
+        tempfile, temp_name = fs.open_binary_tempfile('')
+        tempfile.write(content)
+        tempfile.close()
+        file_interpreter = Executive.interpreter_for_script(temp_name, fs)
+
+        self.assertEqual(file_interpreter, intepreter)
+
+    def test_interpreter_for_script(self):
+        self.assert_interpreter_for_content(None, '')
+        self.assert_interpreter_for_content(None, 'abcd\nefgh\nijklm')
+        self.assert_interpreter_for_content(None, '##/usr/bin/perl')
+        self.assert_interpreter_for_content('perl', '#!/usr/bin/env perl')
+        self.assert_interpreter_for_content('perl', '#!/usr/bin/env perl\nfirst\nsecond')
+        self.assert_interpreter_for_content('perl', '#!/usr/bin/perl')
+        self.assert_interpreter_for_content('perl', '#!/usr/bin/perl -w')
+        self.assert_interpreter_for_content(sys.executable, '#!/usr/bin/env python')
+        self.assert_interpreter_for_content(sys.executable, '#!/usr/bin/env python\nfirst\nsecond')
+        self.assert_interpreter_for_content(sys.executable, '#!/usr/bin/python')
+        self.assert_interpreter_for_content('ruby', '#!/usr/bin/env ruby')
+        self.assert_interpreter_for_content('ruby', '#!/usr/bin/env ruby\nfirst\nsecond')
+        self.assert_interpreter_for_content('ruby', '#!/usr/bin/ruby')
 
     def test_run_command_with_bad_command(self):