Changeset 219483 in webkit


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

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

Reviewed by Dan Bernstein.

.:

Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
and Xcode project files.

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

Tools:

Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource tooling.

  • BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
  • DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h:
  • EWSTools/configure-clang-linux.sh:
  • Scripts/build-webkit:
  • Scripts/do-file-rename:
  • Scripts/do-webcore-rename:
  • Scripts/update-webkit-localizable-strings:
  • Scripts/webkitpy/common/checkout/checkout_unittest.py:
  • Scripts/webkitpy/style/checkers/changelog_unittest.py:
  • Scripts/webkitpy/style/checkers/featuredefines.py:
  • gtk/manifest.txt.in:
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r219480 r219483  
     12017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
     4        https://bugs.webkit.org/show_bug.cgi?id=174162
     5        rdar://problem/33137594
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource cmake files
     10        and Xcode project files.
     11
     12        * Source/cmake/OptionsGTK.cmake:
     13        * Source/cmake/WebKitFS.cmake:
     14        * WebKit.xcworkspace/contents.xcworkspacedata:
     15        * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
     16
    1172017-07-13  Michael Catanzaro  <mcatanzaro@igalia.com>
    218

  • trunk/Source/Makefile

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

  • trunk/Source/cmake/OptionsGTK.cmake

    r219384 r219483  
    440440set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
    441441
    442 set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
     442set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
    443443set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
    444444set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)

  • trunk/Source/cmake/WebKitFS.cmake

    r218436 r219483  
    1515endif ()
    1616if (NOT WEBKIT_DIR)
    17     set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
     17    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
    1818endif ()
    1919if (NOT WEBKIT2_DIR)

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

    r217922 r219483  
    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/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
     34        (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/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"], ["*"]),
    … …  
    5353        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
    5454        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"]),
    55         (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
    56         (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
     55        (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
     56        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
    5757        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
    5858        (["Source/WebCore/ios/foo"], ["ios-10", "ios-simulator-10"]),

  • trunk/Tools/ChangeLog

    r219477 r219483  
     12017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
     4        https://bugs.webkit.org/show_bug.cgi?id=174162
     5        rdar://problem/33137594
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Mass rename of Source/WebKit to Source/WebKitLegacy in OpenSource tooling.
     10
     11        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
     12        * DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h:
     13        * EWSTools/configure-clang-linux.sh:
     14        * Scripts/build-webkit:
     15        * Scripts/do-file-rename:
     16        * Scripts/do-webcore-rename:
     17        * Scripts/update-webkit-localizable-strings:
     18        * Scripts/webkitpy/common/checkout/checkout_unittest.py:
     19        * Scripts/webkitpy/style/checkers/changelog_unittest.py:
     20        * Scripts/webkitpy/style/checkers/featuredefines.py:
     21        * gtk/manifest.txt.in:
     22
    1232017-07-13  Jonathan Bedard  <jbedard@apple.com>
    224

  • trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h

    r75908 r219483  
    1 #include "../../../../Source/WebKit/mac/Misc/WebTypesInternal.h"
     1#include "../../../../Source/WebKitLegacy/mac/Misc/WebTypesInternal.h"

  • trunk/Tools/EWSTools/configure-clang-linux.sh

    r142802 r219483  
    3030fi
    3131
    32 bash /mnt/git/$QUEUE_TYPE/Source/WebKit/chromium/tools/clang/scripts/update.sh
     32bash /mnt/git/$QUEUE_TYPE/Source/WebKitLegacy/chromium/tools/clang/scripts/update.sh
    3333export builddir_name=llvm
    3434export GYP_DEFINES='clang=1'

  • trunk/Tools/Scripts/build-webkit

    r216577 r219483  
    152152
    153153# Check that all the project directories are there.
    154 my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
     154my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKitLegacy");
    155155
    156156# Build WTF as a separate static library on ports which support it.
    … …  
    201201
    202202        # WebInspectorUI must come after JavaScriptCore and WebCore but before WebKit and WebKit2
    203         my $webKitIndex = first { $projects[$_] eq "Source/WebKit" } 0..$#projects;
     203        my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects;
    204204        splice(@projects, $webKitIndex, 0, "Source/WebInspectorUI");
    205205
    … …  
    229229# list after all of the port specific tweaks have been made to
    230230# build options, etc.
    231 @projects = ("Source/WebKit") if $onlyWebKitProject;
     231@projects = ("Source/WebKitLegacy") if $onlyWebKitProject;
    232232
    233233my $result = 0;

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

    r165676 r219483  
    4646find(\&wanted, "Source/JavaScriptCore");
    4747find(\&wanted, "Source/WebCore");
    48 find(\&wanted, "WebKit");
     48find(\&wanted, "Source/WebKitLegacy");
    4949find(\&wanted, "Source/WebKit2");
    5050

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

    r206960 r219483  
    7474find(\&wanted, "Source/WTF");
    7575find(\&wanted, "Source/WebCore");
    76 find(\&wanted, "Source/WebKit");
     76find(\&wanted, "Source/WebKitLegacy");
    7777find(\&wanted, "Source/WebKit2");
    7878find(\&wanted, "Tools/DumpRenderTree");

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

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

  • trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

    r202362 r219483  
    216216"""
    217217
    218         self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Source/WebKit", "ChangeLog")])
     218        self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Source/WebKitLegacy", "ChangeLog")])
    219219
    220220        self.mock_changelog([_changelog3])
    … …  
    232232Reviewed by Darin Adler.
    233233
    234 Source/WebKit:
     234Source/WebKitLegacy:
    235235
    236236* WebKit.xcodeproj/project.pbxproj: Remove references to unused
    … …  
    242242"""
    243243
    244         self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
     244        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKitLegacy", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
    245245
    246246        self.mock_changelog((_changelog3, _changelog4))
    … …  
    258258Reviewed by Darin Adler.
    259259
    260 Source/WebKit:
     260Source/WebKitLegacy:
    261261
    262262* WebKit.xcodeproj/project.pbxproj: Remove references to unused
    … …  
    270270"""
    271271
    272         self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
     272        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKitLegacy", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
    273273
    274274        self.mock_changelog((_changelog3, _changelog5))

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

    r207146 r219483  
    178178                             '        Example bug\n'
    179179                             '        https://bugs.webkit.org/show_bug.cgi?id=12345\n'
    180                              '        * Source/WebKit/foo.cpp:    \n'
    181                              '        * Source/WebKit/bar.cpp:\n'
    182                              '        * Source/WebKit/foobar.cpp: Description\n')
     180                             '        * Source/WebKitLegacy/foo.cpp:    \n'
     181                             '        * Source/WebKitLegacy/bar.cpp:\n'
     182                             '        * Source/WebKitLegacy/foobar.cpp: Description\n')
    183183
    184184    def test_unwanted_security_terms(self):
    … …  
    229229                          '        Several new tests added.\n'
    230230                          '\n'
    231                           '        * Source/WebKit/foo.cpp:    \n'
    232                           '        * Source/WebKit/bar.cpp:\n'
    233                           '        * Source/WebKit/foobar.cpp: Vulnerabilities fixed\n')
     231                          '        * Source/WebKitLegacy/foo.cpp:    \n'
     232                          '        * Source/WebKitLegacy/bar.cpp:\n'
     233                          '        * Source/WebKitLegacy/foobar.cpp: Vulnerabilities fixed\n')
    234234        self.assert_error(5, range(1, 20), 'changelog/unwantedsecurityterms',
    235235                          '2016-11-11 Bogus Person <bperson@example.com>\n'
    … …  
    241241                          '        Several new tests added to check double free.\n'
    242242                          '\n'
    243                           '        * Source/WebKit/foo.cpp:    \n'
    244                           '        * Source/WebKit/bar.cpp:\n'
    245                           '        * Source/WebKit/foobar.cpp: memory CORRUPTION fixed\n')
     243                          '        * Source/WebKitLegacy/foo.cpp:    \n'
     244                          '        * Source/WebKitLegacy/bar.cpp:\n'
     245                          '        * Source/WebKitLegacy/foobar.cpp: memory CORRUPTION fixed\n')

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

    r216030 r219483  
    3333    "Source/WebCore/Configurations/FeatureDefines.xcconfig",
    3434    "Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
    35     "Source/WebKit/mac/Configurations/FeatureDefines.xcconfig",
     35    "Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig",
    3636    "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
    3737    "Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",

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

    r218184 r219483  
    5353exclude Source/WebCore/bindings/scripts/test
    5454exclude Source/WebCore/Resources
    55 exclude Source/WebKit/.*
     55exclude Source/WebKitLegacy/.*
    5656exclude Source/cmake/OptionsWinCairo.cmake$
    5757exclude Source/cmake/OptionsWindows.cmake$

  • trunk/WebKit.xcworkspace/contents.xcworkspacedata

    r210973 r219483  
    2424   </FileRef>
    2525   <FileRef
    26       location = "group:Source/WebKit/WebKit.xcodeproj">
     26      location = "group:Source/WebKitLegacy/WebKit.xcodeproj">
    2727   </FileRef>
    2828   <FileRef

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

    r213252 r219483  
    133133               BuildableName = "WebKitLegacy.framework"
    134134               BlueprintName = "WebKitLegacy"
    135                ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
     135               ReferencedContainer = "container:Source/WebKitLegacy/WebKit.xcodeproj">
    136136            </BuildableReference>
    137137         </BuildActionEntry>
Note: See TracChangeset for help on using the changeset viewer.