Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
authormatthew_hanson@apple.com <matthew_hanson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Jul 2017 02:29:11 +0000 (02:29 +0000)
committermatthew_hanson@apple.com <matthew_hanson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Jul 2017 02:29:11 +0000 (02:29 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
ChangeLog
Source/Makefile
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitFS.cmake
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
Tools/ChangeLog
Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h
Tools/EWSTools/configure-clang-linux.sh
Tools/Scripts/build-webkit
Tools/Scripts/do-file-rename
Tools/Scripts/do-webcore-rename
Tools/Scripts/update-webkit-localizable-strings
Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py
Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py
Tools/Scripts/webkitpy/style/checkers/featuredefines.py
Tools/gtk/manifest.txt.in
WebKit.xcworkspace/contents.xcworkspacedata
WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme

index 5f3b130..2bee373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
+
+        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:
+
 2017-07-13  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Fix compiler warnings when building with GCC 7
index ce038ee..44441c4 100644 (file)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKit WebKit2
+MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
 
 ifneq (,$(SDKROOT))
        ifeq (,$(findstring macosx,$(SDKROOT)))
-               MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKit WebKit2
+               MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
        endif
 endif
 
index 606a843..fa7a6d6 100644 (file)
@@ -439,7 +439,7 @@ set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2
 set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
 set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
 
-set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
+set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
 
index 9be6038..21c43ac 100644 (file)
@@ -14,7 +14,7 @@ if (NOT PAL_DIR)
     set(PAL_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore/PAL")
 endif ()
 if (NOT WEBKIT_DIR)
-    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
+    set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
 endif ()
 if (NOT WEBKIT2_DIR)
     set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
index 8b9d1ee..49ca442 100644 (file)
@@ -31,7 +31,7 @@ class ShouldBuildTest(unittest.TestCase):
         (["Websites/bugs.webkit.org/foo"], []),
         (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
-        (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
+        (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
         (["LayoutTests/foo"], ["*"]),
         (["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
@@ -52,8 +52,8 @@ class ShouldBuildTest(unittest.TestCase):
         (["LayoutTests/platform/win/foo"], ["win"]),
         (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"]),
-        (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
-        (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
+        (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
+        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
         (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["Source/WebCore/ios/foo"], ["ios-10", "ios-simulator-10"]),
         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
index 4075d1a..2b496f7 100644 (file)
@@ -1,3 +1,25 @@
+2017-07-05  Matthew Hanson  <matthew_hanson@apple.com>
+
+        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 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:
+
 2017-07-13  Jonathan Bedard  <jbedard@apple.com>
 
         Add script to rebase patches during the WebKit2->WebKit/WebKit->WebKitLegacy transition
index ae1371f..ab3b4ca 100644 (file)
@@ -1 +1 @@
-#include "../../../../Source/WebKit/mac/Misc/WebTypesInternal.h"
+#include "../../../../Source/WebKitLegacy/mac/Misc/WebTypesInternal.h"
index 049c206..537ab2c 100755 (executable)
@@ -29,6 +29,6 @@ if [[ $# -ne 1 ]];then
     exit 1
 fi
 
-bash /mnt/git/$QUEUE_TYPE/Source/WebKit/chromium/tools/clang/scripts/update.sh
+bash /mnt/git/$QUEUE_TYPE/Source/WebKitLegacy/chromium/tools/clang/scripts/update.sh
 export builddir_name=llvm
-export GYP_DEFINES='clang=1'
\ No newline at end of file
+export GYP_DEFINES='clang=1'
index dad790f..71d154a 100755 (executable)
@@ -151,7 +151,7 @@ setConfiguration();
 my $productDir = productDir();
 
 # Check that all the project directories are there.
-my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
+my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKitLegacy");
 
 # Build WTF as a separate static library on ports which support it.
 splice @projects, 0, 0, "Source/WTF" if isAppleWebKit() or isWinCairo();
@@ -200,7 +200,7 @@ if (isAppleCocoaWebKit()) {
         push @projects, ("Tools/MiniBrowser");
 
         # WebInspectorUI must come after JavaScriptCore and WebCore but before WebKit and WebKit2
-        my $webKitIndex = first { $projects[$_] eq "Source/WebKit" } 0..$#projects;
+        my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects;
         splice(@projects, $webKitIndex, 0, "Source/WebInspectorUI");
 
         # Copy library and header from WebKitLibraries to a findable place in the product directory.
@@ -228,7 +228,7 @@ if (isAppleCocoaWebKit()) {
 # If asked to build just the WebKit project, overwrite the projects
 # list after all of the port specific tweaks have been made to
 # build options, etc.
-@projects = ("Source/WebKit") if $onlyWebKitProject;
+@projects = ("Source/WebKitLegacy") if $onlyWebKitProject;
 
 my $result = 0;
 
index 90a9494..a9c0db6 100755 (executable)
@@ -45,7 +45,7 @@ my %words;
 my @paths;
 find(\&wanted, "Source/JavaScriptCore");
 find(\&wanted, "Source/WebCore");
-find(\&wanted, "WebKit");
+find(\&wanted, "Source/WebKitLegacy");
 find(\&wanted, "Source/WebKit2");
 
 sub wanted
index 0aad007..85a28b6 100755 (executable)
@@ -73,7 +73,7 @@ my @paths;
 find(\&wanted, "Source/JavaScriptCore");
 find(\&wanted, "Source/WTF");
 find(\&wanted, "Source/WebCore");
-find(\&wanted, "Source/WebKit");
+find(\&wanted, "Source/WebKitLegacy");
 find(\&wanted, "Source/WebKit2");
 find(\&wanted, "Tools/DumpRenderTree");
 find(\&wanted, "Tools/TestWebKitAPI");
index 8595359..e5ef1cb 100755 (executable)
@@ -35,7 +35,7 @@ use lib $FindBin::Bin;
 use webkitdirs;
 
 # WebKit and WebKit2 strings go into WebCore's Localizable.strings.
-my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKit/mac", "Source/WebKit/win", "Source/WebKit2", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKit/mac/icu");
+my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit2", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKitLegacy/mac/icu");
 my @webInspectorUIDirectoriesToScan = ("Source/WebInspectorUI/UserInterface");
 
 my $webCoreFileToUpdate = "Source/WebCore/English.lproj/Localizable.strings";
index 501a58e..6e8d38a 100644 (file)
@@ -215,7 +215,7 @@ Reviewed by Darin Adler.
 WebKit.xcconfig file.
 """
 
-        self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Source/WebKit", "ChangeLog")])
+        self.changelog_paths = map(self.filesystem.abspath, [self.filesystem.join("Source/WebKitLegacy", "ChangeLog")])
 
         self.mock_changelog([_changelog3])
         checkout = self.mock_checkout_for_test()
@@ -231,7 +231,7 @@ WebKit.xcconfig file.
 Patch by David Kilzer <ddkilzer@apple.com> on 2014-07-17
 Reviewed by Darin Adler.
 
-Source/WebKit:
+Source/WebKitLegacy:
 
 * WebKit.xcodeproj/project.pbxproj: Remove references to unused
 WebKit.xcconfig file.
@@ -241,7 +241,7 @@ LayoutTests:
 * Path/To/Complicated/File: Added.
 """
 
-        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
+        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKitLegacy", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
 
         self.mock_changelog((_changelog3, _changelog4))
         checkout = self.mock_checkout_for_test()
@@ -257,7 +257,7 @@ LayoutTests:
 Patch by David Kilzer <ddkilzer@apple.com> on 2014-07-17
 Reviewed by Darin Adler.
 
-Source/WebKit:
+Source/WebKitLegacy:
 
 * WebKit.xcodeproj/project.pbxproj: Remove references to unused
 WebKit.xcconfig file.
@@ -269,7 +269,7 @@ Filler change.
 * Path/To/Complicated/File: Added.
 """
 
-        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKit", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
+        self.changelog_paths = map(self.filesystem.abspath, (self.filesystem.join("Source/WebKitLegacy", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog")))
 
         self.mock_changelog((_changelog3, _changelog5))
         checkout = self.mock_checkout_for_test()
index d09f961..c2cde75 100644 (file)
@@ -177,9 +177,9 @@ class ChangeLogCheckerTest(unittest.TestCase):
                              '2011-01-01  Patrick Gansterer  <paroga@paroga.com>\n'
                              '        Example bug\n'
                              '        https://bugs.webkit.org/show_bug.cgi?id=12345\n'
-                             '        * Source/WebKit/foo.cpp:    \n'
-                             '        * Source/WebKit/bar.cpp:\n'
-                             '        * Source/WebKit/foobar.cpp: Description\n')
+                             '        * Source/WebKitLegacy/foo.cpp:    \n'
+                             '        * Source/WebKitLegacy/bar.cpp:\n'
+                             '        * Source/WebKitLegacy/foobar.cpp: Description\n')
 
     def test_unwanted_security_terms(self):
         self.assert_error(5, range(1, 20), 'changelog/unwantedsecurityterms',
@@ -228,9 +228,9 @@ class ChangeLogCheckerTest(unittest.TestCase):
                           '\n'
                           '        Several new tests added.\n'
                           '\n'
-                          '        * Source/WebKit/foo.cpp:    \n'
-                          '        * Source/WebKit/bar.cpp:\n'
-                          '        * Source/WebKit/foobar.cpp: Vulnerabilities fixed\n')
+                          '        * Source/WebKitLegacy/foo.cpp:    \n'
+                          '        * Source/WebKitLegacy/bar.cpp:\n'
+                          '        * Source/WebKitLegacy/foobar.cpp: Vulnerabilities fixed\n')
         self.assert_error(5, range(1, 20), 'changelog/unwantedsecurityterms',
                           '2016-11-11 Bogus Person <bperson@example.com>\n'
                           '        ExampleBug with several security sensitive terms in change log\n'
@@ -240,6 +240,6 @@ class ChangeLogCheckerTest(unittest.TestCase):
                           '\n'
                           '        Several new tests added to check double free.\n'
                           '\n'
-                          '        * Source/WebKit/foo.cpp:    \n'
-                          '        * Source/WebKit/bar.cpp:\n'
-                          '        * Source/WebKit/foobar.cpp: memory CORRUPTION fixed\n')
+                          '        * Source/WebKitLegacy/foo.cpp:    \n'
+                          '        * Source/WebKitLegacy/bar.cpp:\n'
+                          '        * Source/WebKitLegacy/foobar.cpp: memory CORRUPTION fixed\n')
index 84280a6..00059e2 100644 (file)
@@ -32,7 +32,7 @@ FEATURE_DEFINE_FILES = [
     "Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig",
     "Source/WebCore/Configurations/FeatureDefines.xcconfig",
     "Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
-    "Source/WebKit/mac/Configurations/FeatureDefines.xcconfig",
+    "Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig",
     "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
     "Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",
 ]
index da48417..1d99341 100644 (file)
@@ -52,7 +52,7 @@ exclude Source/ThirdParty/qunit
 exclude Source/WebCore/platform/audio/resources
 exclude Source/WebCore/bindings/scripts/test
 exclude Source/WebCore/Resources
-exclude Source/WebKit/.*
+exclude Source/WebKitLegacy/.*
 exclude Source/cmake/OptionsWinCairo.cmake$
 exclude Source/cmake/OptionsWindows.cmake$
 exclude Source/cmake/OptionsAppleWin.cmake$
index 37cfe73..65cf5dd 100644 (file)
@@ -23,7 +23,7 @@
       location = "group:Source/WebInspectorUI/WebInspectorUI.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:Source/WebKit/WebKit.xcodeproj">
+      location = "group:Source/WebKitLegacy/WebKit.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Source/WebKit2/WebKit2.xcodeproj">
index 56cb8a2..6c7fb2a 100644 (file)
                BlueprintIdentifier = "9398100A0824BF01008DF038"
                BuildableName = "WebKitLegacy.framework"
                BlueprintName = "WebKitLegacy"
-               ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
+               ReferencedContainer = "container:Source/WebKitLegacy/WebKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry