Changeset 219486 in webkit


Ignore:
Timestamp:
Jul 13, 2017, 7:29:22 PM (8 years ago)
Author:
matthew_hanson@apple.com
Message:

Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
​https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

.:

  • Source/Makefile:
  • Source/PlatformGTK.cmake:
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/WebKitPackaging.cmake:
  • WebKit.xcworkspace/contents.xcworkspacedata:
  • WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:

Source/WebKit:

  • PlatformGTK.cmake:
  • Shared/API/c/wpe/WebKit.h:

Tools:

  • BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:

(ShouldBuildTest):

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • Scripts/build-webkit:
  • Scripts/do-file-rename:
  • Scripts/do-webcore-rename:
  • Scripts/update-webkit-localizable-strings:
  • Scripts/webkitpy/common/config/watchlist:
  • Scripts/webkitpy/style/checker.py:
  • Scripts/webkitpy/style/checkers/featuredefines.py:
  • gtk/make-dist.py:

(ensure_version_if_possible):

  • gtk/manifest.txt.in:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r219484 r219486  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Source/Makefile:
     10        * Source/PlatformGTK.cmake:
     11        * Source/cmake/OptionsGTK.cmake:
     12        * Source/cmake/WebKitFS.cmake:
     13        * Source/cmake/WebKitPackaging.cmake:
     14        * WebKit.xcworkspace/contents.xcworkspacedata:
     15        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
     16
    1172017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
    218

  • trunk/Source/Makefile

    r219483 r219486  
    1 MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
     1MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit
    22
    33ifneq (,$(SDKROOT))
    44        ifeq (,$(findstring macosx,$(SDKROOT)))
    5                 MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
     5                MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit
    66        endif
    77endif

  • trunk/Source/PlatformGTK.cmake

    r205280 r219486  
    88list(APPEND DocumentationDependencies
    99    WebKit2
    10     "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
    11     "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
     10    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
     11    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
    1212)
    1313

  • trunk/Source/WebKit/ChangeLog

    r219480 r219486  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * PlatformGTK.cmake:
     10        * Shared/API/c/wpe/WebKit.h:
     11
    1122017-07-13  Michael Catanzaro  <mcatanzaro@igalia.com>
    213

  • trunk/Source/WebKit/PlatformGTK.cmake

    r219295 r219486  
    12341234        DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
    12351235)
    1236 install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
    1237               "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
     1236install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
     1237              "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
    12381238        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
    12391239)

  • trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h

    r216497 r219486  
    3232#include <WebKit/WKType.h>
    3333
    34 // From Source/WebKit2/Shared/API/c/
     34// From Source/WebKit/Shared/API/c/
    3535#include <WebKit/WKArray.h>
    3636#include <WebKit/WKData.h>
    … …  
    5050#include <WebKit/WKUserScriptInjectionTime.h>
    5151
    52 // From Source/WebKit2/WebProcess/InjectedBundle/API/c/
     52// From Source/WebKit/WebProcess/InjectedBundle/API/c/
    5353#include <WebKit/WKBundle.h>
    5454#include <WebKit/WKBundleBackForwardList.h>
    … …  
    7676#include <WebKit/WKBundleScriptWorld.h>
    7777
    78 // From Source/WebKit2/UIProcess/API/C
     78// From Source/WebKit/UIProcess/API/C
    7979#include <WebKit/WKBackForwardListItemRef.h>
    8080#include <WebKit/WKBackForwardListRef.h>

  • trunk/Source/cmake/OptionsGTK.cmake

    r219483 r219486  
    441441
    442442set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
    443 set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
    444 set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
     443set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
     444set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
    445445
    446446set(SHOULD_INSTALL_JS_SHELL ON)

  • trunk/Source/cmake/WebKitFS.cmake

    r219483 r219486  
    1818endif ()
    1919if (NOT WEBKIT2_DIR)
    20     set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
     20    set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
    2121endif ()
    2222if (NOT THIRDPARTY_DIR)

  • trunk/Source/cmake/WebKitPackaging.cmake

    r212550 r219486  
    111111            "/WebKitLibraries/"
    112112            "/English\\\\.lproj/"
    113             "/Source/WebKit2/"
     113            "/Source/WebKit/"
    114114            "\\\\.a$"
    115115            "\\\\.exe$"

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py

    r219483 r219486  
    2727class ShouldBuildTest(unittest.TestCase):
    2828    _should_build_tests = [
    29         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
     29        (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit/ChangeLog-2011-02-11"], []),
    3030        (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
    3131        (["Websites/bugs.webkit.org/foo"], []),
    3232        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
    3333        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
    34         (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
     34        (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
    3535        (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
    3636        (["LayoutTests/foo"], ["*"]),

  • trunk/Tools/ChangeLog

    r219483 r219486  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Update tools and configurations after renaming Source/WebKit2 to Source/WebKit.
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
     10        (ShouldBuildTest):
     11        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     12        * Scripts/build-webkit:
     13        * Scripts/do-file-rename:
     14        * Scripts/do-webcore-rename:
     15        * Scripts/update-webkit-localizable-strings:
     16        * Scripts/webkitpy/common/config/watchlist:
     17        * Scripts/webkitpy/style/checker.py:
     18        * Scripts/webkitpy/style/checkers/featuredefines.py:
     19        * gtk/make-dist.py:
     20        (ensure_version_if_possible):
     21        * gtk/manifest.txt.in:
     22
    1232017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
    224

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r219155 r219486  
    4444CLANG_WARN_CXX0X_EXTENSIONS = NO;
    4545HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS);
    46 PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit2/Platform/spi/ios;
     46PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit/Platform/spi/ios;
    4747PLATFORM_HEADER_SEARCH_PATHS[sdk=macosx*] = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
    4848GCC_NO_COMMON_BLOCKS = YES;

  • trunk/Tools/Scripts/build-webkit

    r219483 r219486  
    195195    }
    196196
    197     push @projects, ("Source/WebKit2");
     197    push @projects, ("Source/WebKit");
    198198
    199199    if (!isIOSWebKit()) {

  • trunk/Tools/Scripts/do-file-rename

    r219483 r219486  
    4747find(\&wanted, "Source/WebCore");
    4848find(\&wanted, "Source/WebKitLegacy");
    49 find(\&wanted, "Source/WebKit2");
     49find(\&wanted, "Source/WebKit");
    5050
    5151sub wanted

  • trunk/Tools/Scripts/do-webcore-rename

    r219483 r219486  
    7575find(\&wanted, "Source/WebCore");
    7676find(\&wanted, "Source/WebKitLegacy");
    77 find(\&wanted, "Source/WebKit2");
     77find(\&wanted, "Source/WebKit");
    7878find(\&wanted, "Tools/DumpRenderTree");
    7979find(\&wanted, "Tools/TestWebKitAPI");

  • trunk/Tools/Scripts/update-webkit-localizable-strings

    r219483 r219486  
    3636
    3737# WebKit and WebKit2 strings go into WebCore's Localizable.strings.
    38 my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit2", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKitLegacy/mac/icu");
     38my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKitLegacy/mac/icu");
    3939my @webInspectorUIDirectoriesToScan = ("Source/WebInspectorUI/UserInterface");
    4040

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

    r219301 r219486  
    2323                        r"|Source/WebCore/bindings/js/JSGeolocationCustom.cpp"
    2424                        r"|Source/WebCore/platform/mock/GeolocationClientMock.(h|cpp)"
    25                         r"|Source/WebKit2/WebProcess/Geolocation/",
     25                        r"|Source/WebKit/WebProcess/Geolocation/",
    2626        },
    2727        "GStreamerGraphics": {
    … …  
    7171        },
    7272        "GtkWebKit2PublicAPI": {
    73             "filename": r"Source/WebKit2/UIProcess/API/gtk/"
    74                         r"|Source/WebKit2/UIProcess/API/glib/"
    75                         r"|Source/WebKit2/Shared/API/glib/"
    76                         r"|Source/WebKit2/WebProcess/InjectedBundle/API/gtk/"
    77                         r"|Source/WebKit2/WebProcess/InjectedBundle/API/glib/",
     73            "filename": r"Source/WebKit/UIProcess/API/gtk/"
     74                        r"|Source/WebKit/UIProcess/API/glib/"
     75                        r"|Source/WebKit/Shared/API/glib/"
     76                        r"|Source/WebKit/WebProcess/InjectedBundle/API/gtk/"
     77                        r"|Source/WebKit/WebProcess/InjectedBundle/API/glib/",
    7878        },
    7979        "CoordinatedGraphics": {
    80             "filename": r"Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/"
    81                         r"|Source/WebKit2/UIProcess/CoordinatedGraphics/"
    82                         r"|Source/WebKit2/Shared/CoordinatedGraphics/"
     80            "filename": r"Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/"
     81                        r"|Source/WebKit/UIProcess/CoordinatedGraphics/"
     82                        r"|Source/WebKit/Shared/CoordinatedGraphics/"
    8383                        r"|Source/WebCore/platform/graphics/surfaces/",
    8484        },
    … …  
    320320        },
    321321        "NetworkCache": {
    322             "filename": r"Source/WebKit2/NetworkProcess/cache/",
     322            "filename": r"Source/WebKit/NetworkProcess/cache/",
    323323        },
    324324        "WebCryptoAPI": {

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

    r218684 r219486  
    311311    os.path.join('Tools', 'TestWebKitAPI', 'Tests', 'WebKitGtk'),
    312312
    313     # WebKit*.h files in Source/WebKit2/UIProcess/API/[gtk|wpe], except those ending in Private.h are API headers, which do not follow WebKit coding style.
    314     re.compile(re.escape(os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
    315     re.compile(re.escape(os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
    316     re.compile(re.escape(os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
    317     re.compile(re.escape(os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
     313    # WebKit*.h files in Source/WebKit/UIProcess/API/[gtk|wpe], except those ending in Private.h are API headers, which do not follow WebKit coding style.
     314    re.compile(re.escape(os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
     315    re.compile(re.escape(os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
     316    re.compile(re.escape(os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
     317    re.compile(re.escape(os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
    318318
    319319    # GObject DOM bindings copied from generated code using different coding style.
    320     os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'DOM'),
    321 
    322     os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
    323     os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'wpe', 'webkit.h'),
    324     os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'webkit-web-extension.h'),
    325     os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'wpe', 'webkit-web-extension.h')]
     320    os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'DOM'),
     321
     322    os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
     323    os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'wpe', 'webkit.h'),
     324    os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'webkit-web-extension.h'),
     325    os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'wpe', 'webkit-web-extension.h')]
    326326
    327327# Files to skip that are more common or obvious.

  • trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py

    r219483 r219486  
    3434    "Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
    3535    "Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig",
    36     "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
     36    "Source/WebKit/Configurations/FeatureDefines.xcconfig",
    3737    "Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",
    3838]

  • trunk/Tools/gtk/make-dist.py

    r204460 r219486  
    284284            return
    285285
    286         pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-4.0.pc")
     286        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkitgtk-4.0.pc")
    287287        if os.path.isfile(pkgconfig_file):
    288288            p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)

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

    r219483 r219486  
    6161exclude Source/WebInspectorUI/UserInterface/Images
    6262
    63 exclude Source/WebKit2/Resources
    64 exclude Source/WebKit2/gtk/NEWS$
     63exclude Source/WebKit/Resources
     64exclude Source/WebKit/gtk/NEWS$
    6565
    6666# We do want to include the NEWS, but we want it to be in the root of the archive.
    67 file Source/WebKit2/gtk/NEWS NEWS
     67file Source/WebKit/gtk/NEWS NEWS
    6868
    6969directory Source/WebInspectorUI/UserInterface/Images/gtk

  • trunk/WebKit.xcworkspace/contents.xcworkspacedata

    r219484 r219486  
    2727   </FileRef>
    2828   <FileRef
    29       location = "group:Source/WebKit2/WebKit2.xcodeproj">
     29      location = "group:Source/WebKit/WebKit2.xcodeproj">
    3030   </FileRef>
    3131   <FileRef

  • trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme

    r219484 r219486  
    147147               BuildableName = "All"
    148148               BlueprintName = "All"
    149                ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
     149               ReferencedContainer = "container:Source/WebKit/WebKit2.xcodeproj">
    150150            </BuildableReference>
    151151         </BuildActionEntry>
Note: See TracChangeset for help on using the changeset viewer.