Diff
Modified: trunk/ChangeLog (219482 => 219483)
--- trunk/ChangeLog 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/ChangeLog 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,3 +1,19 @@
+2017-07-05 Matthew Hanson <matthew_han...@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 <mcatanz...@igalia.com>
Fix compiler warnings when building with GCC 7
Modified: trunk/Source/Makefile (219482 => 219483)
--- trunk/Source/Makefile 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/Makefile 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKit WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
ifneq (,$(SDKROOT))
ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKit WebKit2
+ MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
endif
endif
Modified: trunk/Source/cmake/OptionsGTK.cmake (219482 => 219483)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:29:11 UTC (rev 219483)
@@ -439,7 +439,7 @@
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)
Modified: trunk/Source/cmake/WebKitFS.cmake (219482 => 219483)
--- trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:29:11 UTC (rev 219483)
@@ -14,7 +14,7 @@
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")
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (219482 => 219483)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2017-07-14 02:29:11 UTC (rev 219483)
@@ -31,7 +31,7 @@
(["Websites/bugs.webkit.org/foo"], []),
(["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
(["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
- (["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
+ (["Source/_javascript_Core/_javascript_Core.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 @@
(["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"]),
Modified: trunk/Tools/ChangeLog (219482 => 219483)
--- trunk/Tools/ChangeLog 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/ChangeLog 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1,3 +1,25 @@
+2017-07-05 Matthew Hanson <matthew_han...@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 <jbed...@apple.com>
Add script to rebase patches during the WebKit2->WebKit/WebKit->WebKitLegacy transition
Modified: trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h (219482 => 219483)
--- trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/DumpRenderTree/mac/InternalHeaders/WebKit/WebTypesInternal.h 2017-07-14 02:29:11 UTC (rev 219483)
@@ -1 +1 @@
-#include "../../../../Source/WebKit/mac/Misc/WebTypesInternal.h"
+#include "../../../../Source/WebKitLegacy/mac/Misc/WebTypesInternal.h"
Modified: trunk/Tools/EWSTools/configure-clang-linux.sh (219482 => 219483)
--- trunk/Tools/EWSTools/configure-clang-linux.sh 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/EWSTools/configure-clang-linux.sh 2017-07-14 02:29:11 UTC (rev 219483)
@@ -29,6 +29,6 @@
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'
Modified: trunk/Tools/Scripts/build-webkit (219482 => 219483)
--- trunk/Tools/Scripts/build-webkit 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/build-webkit 2017-07-14 02:29:11 UTC (rev 219483)
@@ -151,7 +151,7 @@
my $productDir = productDir();
# Check that all the project directories are there.
-my @projects = ("Source/_javascript_Core", "Source/WebCore", "Source/WebKit");
+my @projects = ("Source/_javascript_Core", "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 @@
push @projects, ("Tools/MiniBrowser");
# WebInspectorUI must come after _javascript_Core 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 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;
Modified: trunk/Tools/Scripts/do-file-rename (219482 => 219483)
--- trunk/Tools/Scripts/do-file-rename 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/do-file-rename 2017-07-14 02:29:11 UTC (rev 219483)
@@ -45,7 +45,7 @@
my @paths;
find(\&wanted, "Source/_javascript_Core");
find(\&wanted, "Source/WebCore");
-find(\&wanted, "WebKit");
+find(\&wanted, "Source/WebKitLegacy");
find(\&wanted, "Source/WebKit2");
sub wanted
Modified: trunk/Tools/Scripts/do-webcore-rename (219482 => 219483)
--- trunk/Tools/Scripts/do-webcore-rename 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/do-webcore-rename 2017-07-14 02:29:11 UTC (rev 219483)
@@ -73,7 +73,7 @@
find(\&wanted, "Source/_javascript_Core");
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");
Modified: trunk/Tools/Scripts/update-webkit-localizable-strings (219482 => 219483)
--- trunk/Tools/Scripts/update-webkit-localizable-strings 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/update-webkit-localizable-strings 2017-07-14 02:29:11 UTC (rev 219483)
@@ -35,7 +35,7 @@
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";
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (219482 => 219483)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2017-07-14 02:29:11 UTC (rev 219483)
@@ -215,7 +215,7 @@
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 @@
Patch by David Kilzer <ddkil...@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 @@
* 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 @@
Patch by David Kilzer <ddkil...@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 @@
* 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()
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py (219482 => 219483)
--- trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py 2017-07-14 02:29:11 UTC (rev 219483)
@@ -177,9 +177,9 @@
'2011-01-01 Patrick Gansterer <par...@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 @@
'\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 <bper...@example.com>\n'
' ExampleBug with several security sensitive terms in change log\n'
@@ -240,6 +240,6 @@
'\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')
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py (219482 => 219483)
--- trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-07-14 02:29:11 UTC (rev 219483)
@@ -32,7 +32,7 @@
"Source/_javascript_Core/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",
]
Modified: trunk/Tools/gtk/manifest.txt.in (219482 => 219483)
--- trunk/Tools/gtk/manifest.txt.in 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/Tools/gtk/manifest.txt.in 2017-07-14 02:29:11 UTC (rev 219483)
@@ -52,7 +52,7 @@
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$
Modified: trunk/WebKit.xcworkspace/contents.xcworkspacedata (219482 => 219483)
--- trunk/WebKit.xcworkspace/contents.xcworkspacedata 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/WebKit.xcworkspace/contents.xcworkspacedata 2017-07-14 02:29:11 UTC (rev 219483)
@@ -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">
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (219482 => 219483)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2017-07-14 02:12:32 UTC (rev 219482)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2017-07-14 02:29:11 UTC (rev 219483)
@@ -132,7 +132,7 @@
BlueprintIdentifier = "9398100A0824BF01008DF038"
BuildableName = "WebKitLegacy.framework"
BlueprintName = "WebKitLegacy"
- ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
+ ReferencedContainer = "container:Source/WebKitLegacy/WebKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
