Title: [163167] trunk/Tools
- Revision
- 163167
- Author
- [email protected]
- Date
- 2014-01-31 02:51:24 -0800 (Fri, 31 Jan 2014)
Log Message
[jhbuild] Disable escape sequences in EWS output
https://bugs.webkit.org/show_bug.cgi?id=127922
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/common/system/environment.py:
(Environment.disable_gcc_smartquotes):
(Environment):
(Environment.disable_jhbuild_VT100_output):
* Scripts/webkitpy/tool/commands/download_unittest.py:
* Scripts/webkitpy/tool/steps/build.py:
(Build.build):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (163166 => 163167)
--- trunk/Tools/ChangeLog 2014-01-31 08:10:11 UTC (rev 163166)
+++ trunk/Tools/ChangeLog 2014-01-31 10:51:24 UTC (rev 163167)
@@ -1,3 +1,18 @@
+2014-01-31 Csaba Osztrogonác <[email protected]>
+
+ [jhbuild] Disable escape sequences in EWS output
+ https://bugs.webkit.org/show_bug.cgi?id=127922
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/common/system/environment.py:
+ (Environment.disable_gcc_smartquotes):
+ (Environment):
+ (Environment.disable_jhbuild_VT100_output):
+ * Scripts/webkitpy/tool/commands/download_unittest.py:
+ * Scripts/webkitpy/tool/steps/build.py:
+ (Build.build):
+
2014-01-30 Martin Robinson <[email protected]>
[GTK] [CMake] Add support for building against GTK+ 2
Modified: trunk/Tools/Scripts/webkitpy/common/system/environment.py (163166 => 163167)
--- trunk/Tools/Scripts/webkitpy/common/system/environment.py 2014-01-31 08:10:11 UTC (rev 163166)
+++ trunk/Tools/Scripts/webkitpy/common/system/environment.py 2014-01-31 10:51:24 UTC (rev 163167)
@@ -39,3 +39,9 @@
# smartquote behavior: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38363
# Apple's XCode sets LC_ALL instead, probably to be future-proof.
self.env['LC_ALL'] = 'C'
+
+ def disable_jhbuild_VT100_output(self):
+ # JHBuild generates VT100 escape sequences if TERM is xterm or rxvt,
+ # which makes browsers set wrong MIME type (e.g. Safari, Chrome).
+ # https://bugs.webkit.org/show_bug.cgi?id=127922
+ self.env['TERM'] = 'none'
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py (163166 => 163167)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2014-01-31 08:10:11 UTC (rev 163166)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py 2014-01-31 10:51:24 UTC (rev 163167)
@@ -162,7 +162,7 @@
MOCK: user.open_url: file://...
Was that diff correct?
Building WebKit
-MOCK run_and_throw_if_fail: ['mock-build-webkit'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}
+MOCK run_and_throw_if_fail: ['mock-build-webkit'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'TERM': 'none', 'MOCK_ENVIRON_COPY': '1'}
Running Python unit tests
MOCK run_and_throw_if_fail: ['mock-test-webkitpy'], cwd=/mock-checkout
Running Perl unit tests
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/build.py (163166 => 163167)
--- trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2014-01-31 08:10:11 UTC (rev 163166)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2014-01-31 10:51:24 UTC (rev 163167)
@@ -46,6 +46,7 @@
def build(self, build_style):
environment = self._tool.copy_current_environment()
environment.disable_gcc_smartquotes()
+ environment.disable_jhbuild_VT100_output()
env = environment.to_dictionary()
build_webkit_command = self._tool.deprecated_port().build_webkit_command(build_style=build_style)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
