Changeset 179218 in webkit

Timestamp:

Jan 27, 2015 2:29:33 PM (9 years ago)

Author:

ap@apple.com

Message:

[Mac] Disable building Java applets by default
​https://bugs.webkit.org/show_bug.cgi?id=140957
rdar://problem/19619529

Reviewed by Anders Carlsson.

It was actually already disabled unconditionally, by accident.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
• Scripts/webkitpy/port/mac.py:

(MacPort._check_port_build):
(MacPort._build_java_test_support):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/mac.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-01-27  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Disable building Java applets by default
+        https://bugs.webkit.org/show_bug.cgi?id=140957
+        rdar://problem/19619529
+
+        Reviewed by Anders Carlsson.
+
+        It was actually already disabled unconditionally, by accident.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort._check_port_build):
+        (MacPort._build_java_test_support):
+
 2015-01-27  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -206 +206 @@
             default=False,
             help="Don't check the system dependencies (themes)"),
-        optparse.make_option("--nojava", action="store_true",
+        optparse.make_option("--java", action="store_true",
             default=False,
-            help="Don't build java support files"),
+            help="Build java support files"),
     ]))
 

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

@@ -148 +148 @@
 
     def _build_java_test_support(self):
-        return True
         java_tests_path = self._filesystem.join(self.layout_tests_dir(), "java")
         build_java = [self.make_command(), "-C", java_tests_path]
@@ -177 +176 @@
 
     def _check_port_build(self):
-        return self.get_option('nojava') or self._build_java_test_support()
+        return not self.get_option('java') or self._build_java_test_support()
 
     def _path_to_webcore_library(self):