Changeset 173689 in webkit


Ignore:
Timestamp:
Sep 17, 2014 2:29:31 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][GTK] Remove WebKit1 related codes
​https://bugs.webkit.org/show_bug.cgi?id=136853

Patch by Renato Nagy <​rnagy@inf.u-szeged.hu> on 2014-09-17
Reviewed by Csaba Osztrogonác.

Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
from scripts.

.:

  • Source/PlatformGTK.cmake:

Tools:

  • BuildSlaveSupport/build.webkit.org-config/config.json:
  • BuildSlaveSupport/build.webkit.org-config/master.cfg:

(Compile32bitJSC):
(BuildAndTestWebKit2Factory):
(CompileWebKit1Only): Deleted.
(CompileWebKit2Only): Deleted.
(BuildAndTestWebKit1OnlyFactory): Deleted.
(BuildAndTestWebKit2OnlyFactory): Deleted.

  • Scripts/build-webkit:
  • Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
  • Scripts/webkitpy/common/config/ports.py:

(GtkWK2Port.build_webkit_command):
(EflWK2Port.build_webkit_command):

  • Scripts/webkitpy/common/config/ports_unittest.py:

(DeprecatedPortTest.test_gtk_wk2_port):

  • Scripts/webkitpy/port/efl.py:

(EflPort.build_webkit_command):

  • Scripts/webkitpy/port/gtk.py:

(GtkPort._built_libraries_path):
(GtkPort._search_paths):
(GtkPort.test_expectations_file_position):
(GtkPort.build_webkit_command):
(GtkPort.run_webkit_tests_command):
(GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r173655 r173689  
     12014-09-17  Renato Nagy  <rnagy@inf.u-szeged.hu>
     2
     3        [EFL][GTK] Remove WebKit1 related codes
     4        https://bugs.webkit.org/show_bug.cgi?id=136853
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
     9        from scripts.
     10
     11        * Source/PlatformGTK.cmake:
     12
    1132014-09-16  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
    214

  • trunk/Source/PlatformGTK.cmake

    r172622 r173689  
    44add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
    55
    6 if (ENABLE_WEBKIT2)
    7     list(APPEND DocumentationDependencies
    8         WebKit2
    9         "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
    10         "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
    11         GObjectDOMBindings
    12     )
    13 endif ()
     6list(APPEND DocumentationDependencies
     7    GObjectDOMBindings
     8    WebKit2
     9    "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
     10    "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
     11)
    1412
    1513if (ENABLE_GTKDOC)
    … …  
    5250)
    5351
    54 if (ENABLE_WEBKIT2)
    55     add_custom_command(
    56         OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    57         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
    58         DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
    59         DEPENDS WebKit2
    60         DEPENDS gtkdoc
    61         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
    62                 --source-dir=${CMAKE_SOURCE_DIR}
    63                 --build-dir=${CMAKE_BINARY_DIR}
    64                 --version=${PROJECT_VERSION}
    65                 ${TOOLS_DIR}/gtk/manifest.txt
    66     )
    6752
    68     add_custom_command(
    69         OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
    70         DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    71         COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    72     )
     53add_custom_command(
     54    OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     55    DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
     56    DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
     57    DEPENDS WebKit2
     58    DEPENDS gtkdoc
     59    COMMAND ${TOOLS_DIR}/gtk/make-dist.py
     60            --source-dir=${CMAKE_SOURCE_DIR}
     61            --build-dir=${CMAKE_BINARY_DIR}
     62            --version=${PROJECT_VERSION}
     63            ${TOOLS_DIR}/gtk/manifest.txt
     64)
    7365
    74     add_custom_target(dist
    75         DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
    76     )
     66add_custom_command(
     67    OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
     68    DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     69    COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     70)
    7771
    78     add_custom_target(distcheck
    79         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
    80         DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
    81         DEPENDS WebKit2
    82         DEPENDS gtkdoc
    83         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
    84                 --check
    85                 --source-dir=${CMAKE_SOURCE_DIR}
    86                 --build-dir=${CMAKE_BINARY_DIR}
    87                 --version=/webkitgtk-${PROJECT_VERSION}
    88                 ${TOOLS_DIR}/gtk/manifest.txt
    89         COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    90     )
    91 endif ()
     72add_custom_target(dist
     73    DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
     74)
     75
     76add_custom_target(distcheck
     77    DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
     78    DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
     79    DEPENDS WebKit2
     80    DEPENDS gtkdoc
     81    COMMAND ${TOOLS_DIR}/gtk/make-dist.py
     82            --check
     83            --source-dir=${CMAKE_SOURCE_DIR}
     84            --build-dir=${CMAKE_BINARY_DIR}
     85            --version=/webkitgtk-${PROJECT_VERSION}
     86            ${TOOLS_DIR}/gtk/manifest.txt
     87    COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     88)

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r173627 r173689  
    203203                    },
    204204                    {
    205                       "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTestWebKit2Only", "builddir": "efl-linux-64-release-wk2",
     205                      "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTest", "builddir": "efl-linux-64-release-wk2",
    206206                      "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
    207207                      "slavenames": ["efl-linux-slave-2"]

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

    r173653 r173689  
    235235class Compile32bitJSC(CompileWebKit):
    236236    command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
    237 
    238 class CompileWebKit1Only(CompileWebKit):
    239     command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit2", WithProperties("--%(configuration)s")]
    240 
    241 
    242 class CompileWebKit2Only(CompileWebKit):
    243     command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit1", WithProperties("--%(configuration)s")]
    244237
    245238
    … …  
    904897    LayoutTestClass = RunWebKit2Tests
    905898
    906 class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
    907     CompileClass = CompileWebKit1Only
    908 
    909 class BuildAndTestWebKit2OnlyFactory(BuildAndTestFactory):
    910     CompileClass = CompileWebKit2Only
    911     LayoutTestClass = RunWebKit2Tests
    912 
    913899class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
    914900    LayoutTestClass = None

  • trunk/Tools/ChangeLog

    r173673 r173689  
     12014-09-17  Renato Nagy  <rnagy@inf.u-szeged.hu>
     2
     3        [EFL][GTK] Remove WebKit1 related codes
     4        https://bugs.webkit.org/show_bug.cgi?id=136853
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
     9        from scripts.
     10
     11        * BuildSlaveSupport/build.webkit.org-config/config.json:
     12        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
     13        (Compile32bitJSC):
     14        (BuildAndTestWebKit2Factory):
     15        (CompileWebKit1Only): Deleted.
     16        (CompileWebKit2Only): Deleted.
     17        (BuildAndTestWebKit1OnlyFactory): Deleted.
     18        (BuildAndTestWebKit2OnlyFactory): Deleted.
     19        * Scripts/build-webkit:
     20        * Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
     21        * Scripts/webkitpy/common/config/ports.py:
     22        (GtkWK2Port.build_webkit_command):
     23        (EflWK2Port.build_webkit_command):
     24        * Scripts/webkitpy/common/config/ports_unittest.py:
     25        (DeprecatedPortTest.test_gtk_wk2_port):
     26        * Scripts/webkitpy/port/efl.py:
     27        (EflPort.build_webkit_command):
     28        * Scripts/webkitpy/port/gtk.py:
     29        (GtkPort._built_libraries_path):
     30        (GtkPort._search_paths):
     31        (GtkPort.test_expectations_file_position):
     32        (GtkPort.build_webkit_command):
     33        (GtkPort.run_webkit_tests_command):
     34        (GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.
     35
    1362014-09-16  Daniel Bates  <dabates@apple.com>
    237

  • trunk/Tools/Scripts/build-webkit

    r173070 r173689  
    6060my $cmakeArgs = "";
    6161my $onlyWebKitProject = 0;
    62 my $noWebKit1 = 0;
    63 my $noWebKit2 = 0;
    6462my $coverageSupport = 0;
    6563my $shouldRunStaticAnalyzer = 0;
    … …  
    110108
    111109  --only-webkit                     Build only the WebKit project
    112   --no-webkit1                      Omit WebKit1 code from the build (EFL/GTK only)
    113   --no-webkit2                      Omit WebKit2 code from the build
    114110
    115111EOF
    … …  
    125121    'minimal' => \$minimal,
    126122    'only-webkit' => \$onlyWebKitProject,
    127     'no-webkit1' => \$noWebKit1,
    128     'no-webkit2' => \$noWebKit2,
    129123    'coverage' => \$coverageSupport,
    130124    'analyze' => \$shouldRunStaticAnalyzer,
    … …  
    247241
    248242if (isCMakeBuild()) {
    249     $cmakeArgs = "-DENABLE_WEBKIT=OFF "  . $cmakeArgs if $noWebKit1;
    250     $cmakeArgs = "-DENABLE_WEBKIT2=OFF " . $cmakeArgs if $noWebKit2;
    251243
    252244    # By default we build using all of the available CPUs.

  • trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl

    r162616 r173689  
    6969    description => "option whose value is the empty string and follows an equal sign", # Unrecognized argument; no change
    7070    argToCheck => "--sdk",
    71     args => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
    72     expectedArgs => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
     71    args => ["--clean", "--debug", "--sdk="],
     72    expectedArgs => ["--clean", "--debug", "--sdk="],
    7373    expectedReturn => undef,
    7474},

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

    r170582 r173689  
    146146        command.append("--gtk")
    147147        command.append("--update-gtk")
    148         command.append("--no-webkit1")
    149148        command.append(super(GtkWK2Port, self).makeArgs())
    150149        return command
    … …  
    164163        command.append("--efl")
    165164        command.append("--update-efl")
    166         command.append("--no-webkit1")
    167165        command.append(super(EflWK2Port, self).makeArgs())
    168166        return command

  • trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

    r170582 r173689  
    4343        self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
    4444        self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
    45         self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
    46         self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
     45        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
     46        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])

  • trunk/Tools/Scripts/webkitpy/port/efl.py

    r172830 r173689  
    136136        command = super(EflPort, self).build_webkit_command(build_style)
    137137        command.extend(["--efl", "--update-efl"])
    138         if self.get_option('webkit_test_runner'):
    139             command.append("--no-webkit1")
    140         else:
    141             command.append("--no-webkit2")
    142138        command.append(super(EflPort, self).make_args())
    143139        return command

  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r172830 r173689  
    7070        return self._build_path(*(('lib',) + path))
    7171
    72     def warn_if_bug_missing_in_test_expectations(self):
    73         return not self.get_option('webkit_test_runner')
    74 
    7572    def _port_flag_for_scripts(self):
    7673        return "--gtk"
    … …  
    178175    def _search_paths(self):
    179176        search_paths = []
    180         if self.get_option('webkit_test_runner'):
    181             search_paths.extend([self.port_name + '-wk2', 'wk2'])
    182         else:
    183             search_paths.append(self.port_name + '-wk1')
    184177        search_paths.append(self.port_name)
     178        search_paths.append('wk2')
    185179        search_paths.extend(self.get_option("additional_platform_directory", []))
    186180        return search_paths
    … …  
    216210        return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
    217211
     212    def test_expectations_file_position(self):
     213        # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
     214        return 2
     215
    218216    def build_webkit_command(self, build_style=None):
    219217        command = super(GtkPort, self).build_webkit_command(build_style)
    220218        command.extend(["--gtk", "--update-gtk"])
    221 
    222         if self.get_option('webkit_test_runner'):
    223             command.append("--no-webkit1")
    224         else:
    225             command.append("--no-webkit2")
    226 
    227219        command.append(super(GtkPort, self).make_args())
    228220        return command
    … …  
    231223        command = super(GtkPort, self).run_webkit_tests_command()
    232224        command.append("--gtk")
    233         if self.get_option('webkit_test_runner'):
    234             command.append("-2")
    235225        return command

  • trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py

    r157682 r173689  
    5353    def test_default_baseline_search_path(self):
    5454        port = self.make_port()
    55         self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk1',
    56             '/mock-checkout/LayoutTests/platform/gtk'])
    57 
    58         port = self.make_port(options=MockOptions(webkit_test_runner=True))
    59         self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk2',
    60             '/mock-checkout/LayoutTests/platform/wk2', '/mock-checkout/LayoutTests/platform/gtk'])
     55        self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
     56            '/mock-checkout/LayoutTests/platform/wk2'])
    6157
    6258    def test_port_specific_expectations_files(self):
    6359        port = self.make_port()
    6460        self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
    65             '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
    66             '/mock-checkout/LayoutTests/platform/gtk-wk1/TestExpectations'])
    67 
    68         port = self.make_port(options=MockOptions(webkit_test_runner=True))
    69         self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
    70             '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
    7161            '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
    72             '/mock-checkout/LayoutTests/platform/gtk-wk2/TestExpectations'])
     62            '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
    7363
    7464    def test_show_results_html_file(self):

  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

    r170527 r173689  
    9292        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
    9393        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
    94         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
    95         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
     94        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
     95        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
    9696        self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
    9797
Note: See TracChangeset for help on using the changeset viewer.