Changeset 217216 in webkit


Ignore:
Timestamp:
May 22, 2017 5:18:17 AM (7 years ago)
Author:
tpopela@redhat.com
Message:

Remove some of the EFL port leftovers
​https://bugs.webkit.org/show_bug.cgi?id=172440

Reviewed by Carlos Garcia Campos.

Source/WebKit2:

  • Scripts/generate-forwarding-headers.pl:

Tools:

  • BuildSlaveSupport/built-product-archive:

(archiveBuiltProduct):
(extractBuiltProduct):

  • BuildSlaveSupport/test-result-archive:

(archiveTestResults):

  • ImageDiff/PlatformEfl.cmake: Removed.
  • Scripts/run-efl-tests: Removed.
  • Scripts/webkit-build-directory:
  • Scripts/webkitpy/common/config/contributionareas.py:
  • Scripts/webkitpy/common/config/watchlist:
  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):
(_set_up_derived_options):

  • Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner.init):

  • Scripts/webkitpy/style/checker.py:
  • Scripts/webkitpy/style/checker_unittest.py:

(GlobalVariablesTest.test_path_rules_specifier):

  • gtk/manifest.txt.in:
  • jhbuild/jhbuild-wrapper:
Location:
trunk
Files:
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r217214 r217216  
     12017-05-22  Tomas Popela  <tpopela@redhat.com>
     2
     3        Remove some of the EFL port leftovers
     4        https://bugs.webkit.org/show_bug.cgi?id=172440
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Scripts/generate-forwarding-headers.pl:
     9
    1102017-05-22  Gwang Yoon Hwang  <yoon@igalia.com>
    211

  • trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl

    r216497 r217216  
    3636
    3737my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
    38 my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "CoordinatedGraphics", "curl", "efl", "gtk", "ios", "mac", "soup", "win", "wpe");
     38my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "CoordinatedGraphics", "curl", "gtk", "ios", "mac", "soup", "win", "wpe");
    3939my @frameworks = ("JavaScriptCore", "WebCore", "WebKit");
    4040my @skippedPrefixes;

  • trunk/Tools/BuildSlaveSupport/built-product-archive

    r216497 r217216  
    171171
    172172def archiveBuiltProduct(configuration, platform, fullPlatform):
    173     assert platform in ('mac', 'win', 'gtk', 'efl', 'ios', 'wpe')
     173    assert platform in ('mac', 'win', 'gtk', 'ios', 'wpe')
    174174
    175175    if platform == 'ios':
    … …  
    199199        shutil.rmtree(thinDirectory)
    200200
    201     elif platform == 'gtk' or platform == 'efl' or platform == 'wpe':
    202         # On GTK+/EFL we don't need the intermediate step of creating a thinDirectory
     201    elif platform == 'gtk' or platform == 'wpe':
     202        # On GTK+/WPE we don't need the intermediate step of creating a thinDirectory
    203203        # to be compressed in a ZIP file, because we can create the ZIP directly.
    204204        # This is faster and requires less disk resources.
    … …  
    233233
    234234def extractBuiltProduct(configuration, platform):
    235     assert platform in ('mac', 'win', 'gtk', 'efl', 'ios', 'wpe')
     235    assert platform in ('mac', 'win', 'gtk', 'ios', 'wpe')
    236236
    237237    archiveFile = os.path.join(_topLevelBuildDirectory, configuration + '.zip')
    … …  
    242242    if platform in ('mac', 'ios'):
    243243        return unzipArchive(_topLevelBuildDirectory, configuration)
    244     elif platform == 'win' or platform == 'gtk' or platform == 'efl' or platform == 'wpe':
     244    elif platform == 'win' or platform == 'gtk' or platform == 'wpe':
    245245        print 'Extracting', _configurationBuildDirectory
    246246        return unzipArchive(_configurationBuildDirectory, configuration)

  • trunk/Tools/BuildSlaveSupport/test-result-archive

    r216497 r217216  
    4747
    4848def archiveTestResults(configuration, platform, layoutTestResultsDir):
    49     assert platform in ('mac', 'win', 'gtk', 'efl', 'wincairo', 'ios', 'wpe')
     49    assert platform in ('mac', 'win', 'gtk', 'wincairo', 'ios', 'wpe')
    5050
    5151    try:
    … …  
    6767        if subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", "--zlibCompressionLevel", "2", layoutTestResultsDir, archiveFile]):
    6868            return 1
    69     elif platform in ('win', 'gtk', 'efl', 'wincairo', 'wpe'):
     69    elif platform in ('win', 'gtk', 'wincairo', 'wpe'):
    7070        if subprocess.call(["zip", "-r", "-2", archiveFile, "."], cwd=layoutTestResultsDir):
    7171            return 1

  • trunk/Tools/ChangeLog

    r217210 r217216  
     12017-05-22  Tomas Popela  <tpopela@redhat.com>
     2
     3        Remove some of the EFL port leftovers
     4        https://bugs.webkit.org/show_bug.cgi?id=172440
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * BuildSlaveSupport/built-product-archive:
     9        (archiveBuiltProduct):
     10        (extractBuiltProduct):
     11        * BuildSlaveSupport/test-result-archive:
     12        (archiveTestResults):
     13        * ImageDiff/PlatformEfl.cmake: Removed.
     14        * Scripts/run-efl-tests: Removed.
     15        * Scripts/webkit-build-directory:
     16        * Scripts/webkitpy/common/config/contributionareas.py:
     17        * Scripts/webkitpy/common/config/watchlist:
     18        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     19        (parse_args):
     20        (_set_up_derived_options):
     21        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
     22        (PerfTestsRunner.__init__):
     23        * Scripts/webkitpy/style/checker.py:
     24        * Scripts/webkitpy/style/checker_unittest.py:
     25        (GlobalVariablesTest.test_path_rules_specifier):
     26        * gtk/manifest.txt.in:
     27        * jhbuild/jhbuild-wrapper:
     28
    1292017-05-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    230

  • trunk/Tools/Scripts/webkit-build-directory

    r190698 r217216  
    5050  --top-level           Show the top-level build directory
    5151
    52   --efl                 Find the build directory for the EFL port
    5352  --gtk                 Find the build directory for the GTK+ port
    5453  --wincairo            Find the build directory for using Cairo (rather than CoreGraphics) on Windows

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

    r166239 r217216  
    9393    _Area('Drag and Drop', ['drag']),
    9494    _Area('DumpRenderTree'),
    95     _Area('EFL', ['efl']),
    9695    _Area('Editing / Selection', ['editing']),
    9796    _Area('Event Handling', ['event']),
    … …  
    137136# FIXME: 'Text Layout'
    138137    _Area('The Chromium Port', ['chromium']),
    139     _Area('The EFLWebKit Port', ['efl']),
    140138    _Area('The WebKitGTK+ Port', ['gtk']),
    141139    _Area('The Haiku Port', ['haiku']),

  • trunk/Tools/Scripts/webkitpy/common/config/watchlist

    r213862 r217216  
    101101                        r"|Source/WebCore/dom/NamedNodeMap\.(cpp|h|idl)"
    102102                        r"|Source/WebCore/dom/Element\.(cpp|h|idl)",
    103         },
    104         "EFL": {
    105             "filename": r"Source/WebCore/platform/efl/"
    106                         r"|Source/WTF/wtf/efl/"
    107                         r"|LayoutTests/platform/efl/",
    108         },
    109         "EFLWebKit2PublicAPI": {
    110             "filename": r"Source/WebKit2/WebProcess/InjectedBundle/API/efl/"
    111                         r"|Source/WebKit2/UIProcess/API/efl/"
    112                         r"|Source/WebKit2/UIProcess/API/C/efl/",
    113         },
    114         "EFLWebKit2PlatformSpecific": {
    115             "filename": r"Source/WebKit2/.*\.(cmake|txt)"
    116                         r"|Source/WebKit2/Platform/efl/"
    117                         r"|Source/WebKit2/efl/"
    118                         r"|Source/WebKit2/Shared/API/c/efl/"
    119                         r"|Source/WebKit2/Shared/efl/"
    120                         r"|Source/WebKit2/WebProcess/InjectedBundle/efl/"
    121                         r"|Source/WebKit2/WebProcess/WebPage/efl/"
    122                         r"|Source/WebKit2/WebProcess/efl/"
    123                         r"|Source/WebKit2/WebProcess/Downloads/efl/"
    124                         r"|Source/WebKit2/WebProcess/WebCoreSupport/efl/"
    125                         r"|Source/WebKit2/UIProcess/efl/"
    126                         r"|Source/WebKit2/UIProcess/Launcher/efl/",
    127103        },
    128104        "CMake": {
    … …  
    374350        "DOM": [ "esprehn+autocc@chromium.org", "kangil.han@samsung.com", "cdumez@apple.com", "dbates@webkit.org" ],
    375351        "DOMAttributes": [ "cmarcelo@webkit.org", "cdumez@apple.com" ],
    376         "EFL": [ "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com", "sergio.correia@openbossa.org" ],
    377         "EFLWebKit2PlatformSpecific": [ "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com", "sergio.correia@openbossa.org" ],
    378         "EFLWebKit2PublicAPI": [ "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com", "sergio.correia@openbossa.org" ],
    379352        "Editing": [ "mifenton@rim.com" ],
    380353        "Filters": [ "dino@apple.com", "kondapallykalyan@gmail.com" ],

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

    r216497 r217216  
    104104    option_group_definitions.append(("Configuration options", configuration_options()))
    105105    option_group_definitions.append(("Printing Options", printing.print_options()))
    106 
    107     option_group_definitions.append(("EFL-specific Options", [
    108         optparse.make_option("--webprocess-cmd-prefix", type="string",
    109             default=False, help="Prefix used when spawning the Web process (Debug mode only)"),
    110     ]))
    111106
    112107    option_group_definitions.append(("Feature Switches", [
    … …  
    425420        options.verbose = True
    426421
    427     # The GTK+ and EFL ports only support WebKit2 so they always use WKTR.
    428     if options.platform in ["efl", "gtk", "wpe"]:
     422    # The GTK+ and WPE ports only support WebKit2 so they always use WKTR.
     423    if options.platform in ["gtk", "wpe"]:
    429424        options.webkit_test_runner = True
    430425

  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

    r217089 r217216  
    7070        self._options.additional_drt_flag.append('--no-timeout')
    7171
    72         # The GTK+ and EFL ports only supports WebKit2, so they always use WKTR.
    73         if self._port.name().startswith("gtk") or self._port.name().startswith("efl"):
     72        # The GTK+ port only supports WebKit2, so it always uses WKTR.
     73        if self._port.name().startswith("gtk"):
    7474            self._options.webkit_test_runner = True
    7575

  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r216110 r217216  
    171171     ["-readability/parameter_name",
    172172      "-whitespace/parens"]),
    173 
    174     ([# The EFL APIs use EFL naming style, which includes
    175       # both lower-cased and camel-cased, underscore-sparated
    176       # values.
    177       os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'efl'),
    178       os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'efl')],
    179      ["-readability/naming",
    180       "-readability/parameter_name"]),
    181     ([# MiniBrowser/efl are EFL simple application.
    182       # They need to use efl coding style and they don't have config.h.
    183       os.path.join('Tools', 'MiniBrowser', 'efl')],
    184      ["-readability/naming",
    185       "-readability/parameter_name",
    186       "-runtime/ctype_function",
    187       "-whitespace/declaration",
    188       "-whitespace/indent",
    189       "-build/include_order"]),
    190173
    191174    # WebKit2 rules:

  • trunk/Tools/Scripts/webkitpy/style/checker_unittest.py

    r205281 r217216  
    224224        assertCheck("random_path.cpp",
    225225                    "readability/naming")
    226         assertNoCheck(os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'efl', 'ewk_view.h'),
    227                       "readability/naming")
    228226        assertNoCheck(os.path.join('Source', 'WebCore', 'css', 'CSSParser.cpp'),
    229227                      "readability/naming")

  • trunk/Tools/gtk/manifest.txt.in

    r217210 r217216  
    4444
    4545# Exclude directories from other ports
    46 exclude .*\/(Configurations|mac|ios|cf|cg|cocoa|Cocoa|objc|avfoundation|ca|curl|efl|win|wpe)\/.*$
     46exclude .*\/(Configurations|mac|ios|cf|cg|cocoa|Cocoa|objc|avfoundation|ca|curl|win|wpe)\/.*$
    4747
    4848directory Source
    … …  
    5252exclude Source/WebCore/platform/audio/resources
    5353exclude Source/WebCore/bindings/scripts/test
    54 exclude Source/WebCore/platform/efl/DefaultTheme
    5554exclude Source/WebCore/Resources
    5655exclude Source/WebKit/.*
    57 exclude Source/cmake/EFLHelpers.cmake$
    5856exclude Source/cmake/OptionsWinCairo.cmake$
    5957exclude Source/cmake/OptionsWindows.cmake$
    6058exclude Source/cmake/OptionsAppleWin.cmake$
    61 exclude Source/cmake/OptionsEfl.cmake$
    6259exclude Source/cmake/OptionsWPE.cmake$
    63 exclude Source/cmake/eflsymbols.filter$
    6460exclude Source/WebInspectorUI/Tools
    6561exclude Source/WebInspectorUI/UserInterface/Images

  • trunk/Tools/jhbuild/jhbuild-wrapper

    r216497 r217216  
    2828
    2929def determine_platform():
    30     if '--efl' in sys.argv:
    31         return "efl";
    3230    if '--gtk' in sys.argv:
    3331        return "gtk";
Note: See TracChangeset for help on using the changeset viewer.