Diff
Modified: trunk/ChangeLog (219485 => 219486)
--- trunk/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/ChangeLog 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,19 @@
+2017-07-13 Matthew Hanson <matthew_han...@apple.com>
+
+ 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:
+
2017-07-05 Matthew Hanson <matthew_han...@apple.com>
Update the Xcode project name from WebKit to WebKitLegacy.
Modified: trunk/Source/Makefile (219485 => 219486)
--- trunk/Source/Makefile 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/Makefile 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,8 +1,8 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit2
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebInspectorUI WebKitLegacy WebKit
ifneq (,$(SDKROOT))
ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit2
+ MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE ThirdParty/libwebrtc WebCore WebKitLegacy WebKit
endif
endif
Modified: trunk/Source/PlatformGTK.cmake (219485 => 219486)
--- trunk/Source/PlatformGTK.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/PlatformGTK.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -7,8 +7,8 @@
list(APPEND DocumentationDependencies
WebKit2
- "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
- "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
+ "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
+ "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-${WEBKITGTK_API_VERSION}-sections.txt"
)
if (ENABLE_GTKDOC)
Modified: trunk/Source/WebKit/ChangeLog (219485 => 219486)
--- trunk/Source/WebKit/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/WebKit/ChangeLog 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,14 @@
+2017-07-13 Matthew Hanson <matthew_han...@apple.com>
+
+ 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.
+
+ * PlatformGTK.cmake:
+ * Shared/API/c/wpe/WebKit.h:
+
2017-07-13 Michael Catanzaro <mcatanz...@igalia.com>
Fix compiler warnings when building with GCC 7
Modified: trunk/Source/WebKit/PlatformGTK.cmake (219485 => 219486)
--- trunk/Source/WebKit/PlatformGTK.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1233,8 +1233,8 @@
install(TARGETS webkit2gtkinjectedbundle
DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
)
-install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
- "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
+install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
+ "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
)
install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
Modified: trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h (219485 => 219486)
--- trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/WebKit/Shared/API/c/wpe/WebKit.h 2017-07-14 02:29:22 UTC (rev 219486)
@@ -31,7 +31,7 @@
#include <WebKit/WKBase.h>
#include <WebKit/WKType.h>
-// From Source/WebKit2/Shared/API/c/
+// From Source/WebKit/Shared/API/c/
#include <WebKit/WKArray.h>
#include <WebKit/WKData.h>
#include <WebKit/WKDeclarationSpecifiers.h>
@@ -49,7 +49,7 @@
#include <WebKit/WKUserContentInjectedFrames.h>
#include <WebKit/WKUserScriptInjectionTime.h>
-// From Source/WebKit2/WebProcess/InjectedBundle/API/c/
+// From Source/WebKit/WebProcess/InjectedBundle/API/c/
#include <WebKit/WKBundle.h>
#include <WebKit/WKBundleBackForwardList.h>
#include <WebKit/WKBundleBackForwardListItem.h>
@@ -75,7 +75,7 @@
#include <WebKit/WKBundleRangeHandle.h>
#include <WebKit/WKBundleScriptWorld.h>
-// From Source/WebKit2/UIProcess/API/C
+// From Source/WebKit/UIProcess/API/C
#include <WebKit/WKBackForwardListItemRef.h>
#include <WebKit/WKBackForwardListRef.h>
#include <WebKit/WKContext.h>
Modified: trunk/Source/cmake/OptionsGTK.cmake (219485 => 219486)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -440,8 +440,8 @@
set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
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)
+set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
+set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
set(SHOULD_INSTALL_JS_SHELL ON)
Modified: trunk/Source/cmake/WebKitFS.cmake (219485 => 219486)
--- trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -17,7 +17,7 @@
set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKitLegacy")
endif ()
if (NOT WEBKIT2_DIR)
- set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
+ set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
endif ()
if (NOT THIRDPARTY_DIR)
set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
Modified: trunk/Source/cmake/WebKitPackaging.cmake (219485 => 219486)
--- trunk/Source/cmake/WebKitPackaging.cmake 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Source/cmake/WebKitPackaging.cmake 2017-07-14 02:29:22 UTC (rev 219486)
@@ -110,7 +110,7 @@
"/wxcode/" "/Wxcode/" "wxcode\\\\." "Wxcode\\\\."
"/WebKitLibraries/"
"/English\\\\.lproj/"
- "/Source/WebKit2/"
+ "/Source/WebKit/"
"\\\\.a$"
"\\\\.exe$"
"\\\\.mm$"
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (219485 => 219486)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2017-07-14 02:29:22 UTC (rev 219486)
@@ -26,12 +26,12 @@
class ShouldBuildTest(unittest.TestCase):
_should_build_tests = [
- (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
+ (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit/ChangeLog-2011-02-11"], []),
(["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
(["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/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
+ (["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit/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"], ["*"]),
Modified: trunk/Tools/ChangeLog (219485 => 219486)
--- trunk/Tools/ChangeLog 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/ChangeLog 2017-07-14 02:29:22 UTC (rev 219486)
@@ -1,3 +1,25 @@
+2017-07-13 Matthew Hanson <matthew_han...@apple.com>
+
+ 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.
+
+ * 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:
+
2017-07-05 Matthew Hanson <matthew_han...@apple.com>
Update tools and configurations after renaming Source/WebKit to Source/WebKitLegacy.
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (219485 => 219486)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-07-14 02:29:22 UTC (rev 219486)
@@ -43,7 +43,7 @@
CLANG_CXX_LIBRARY = libc++;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS);
-PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit2/Platform/spi/ios;
+PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit/Platform/spi/ios;
PLATFORM_HEADER_SEARCH_PATHS[sdk=macosx*] = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
GCC_NO_COMMON_BLOCKS = YES;
ENABLE_STRICT_OBJC_MSGSEND=YES;
Modified: trunk/Tools/Scripts/build-webkit (219485 => 219486)
--- trunk/Tools/Scripts/build-webkit 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/build-webkit 2017-07-14 02:29:22 UTC (rev 219486)
@@ -194,7 +194,7 @@
splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc");
}
- push @projects, ("Source/WebKit2");
+ push @projects, ("Source/WebKit");
if (!isIOSWebKit()) {
push @projects, ("Tools/MiniBrowser");
Modified: trunk/Tools/Scripts/do-file-rename (219485 => 219486)
--- trunk/Tools/Scripts/do-file-rename 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/do-file-rename 2017-07-14 02:29:22 UTC (rev 219486)
@@ -46,7 +46,7 @@
find(\&wanted, "Source/_javascript_Core");
find(\&wanted, "Source/WebCore");
find(\&wanted, "Source/WebKitLegacy");
-find(\&wanted, "Source/WebKit2");
+find(\&wanted, "Source/WebKit");
sub wanted
{
Modified: trunk/Tools/Scripts/do-webcore-rename (219485 => 219486)
--- trunk/Tools/Scripts/do-webcore-rename 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/do-webcore-rename 2017-07-14 02:29:22 UTC (rev 219486)
@@ -74,7 +74,7 @@
find(\&wanted, "Source/WTF");
find(\&wanted, "Source/WebCore");
find(\&wanted, "Source/WebKitLegacy");
-find(\&wanted, "Source/WebKit2");
+find(\&wanted, "Source/WebKit");
find(\&wanted, "Tools/DumpRenderTree");
find(\&wanted, "Tools/TestWebKitAPI");
Modified: trunk/Tools/Scripts/update-webkit-localizable-strings (219485 => 219486)
--- trunk/Tools/Scripts/update-webkit-localizable-strings 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/update-webkit-localizable-strings 2017-07-14 02:29:22 UTC (rev 219486)
@@ -35,7 +35,7 @@
use webkitdirs;
# WebKit and WebKit2 strings go into WebCore's Localizable.strings.
-my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit2", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKitLegacy/mac/icu");
+my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit", "--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/config/watchlist (219485 => 219486)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2017-07-14 02:29:22 UTC (rev 219486)
@@ -22,7 +22,7 @@
r"|Source/WebCore/page/GeolocationClient.h"
r"|Source/WebCore/bindings/js/JSGeolocationCustom.cpp"
r"|Source/WebCore/platform/mock/GeolocationClientMock.(h|cpp)"
- r"|Source/WebKit2/WebProcess/Geolocation/",
+ r"|Source/WebKit/WebProcess/Geolocation/",
},
"GStreamerGraphics": {
"filename": r"Source/WebCore/platform/graphics/gstreamer/",
@@ -70,16 +70,16 @@
"filename": r"Source/WebCore/page/animation/",
},
"GtkWebKit2PublicAPI": {
- "filename": r"Source/WebKit2/UIProcess/API/gtk/"
- r"|Source/WebKit2/UIProcess/API/glib/"
- r"|Source/WebKit2/Shared/API/glib/"
- r"|Source/WebKit2/WebProcess/InjectedBundle/API/gtk/"
- r"|Source/WebKit2/WebProcess/InjectedBundle/API/glib/",
+ "filename": r"Source/WebKit/UIProcess/API/gtk/"
+ r"|Source/WebKit/UIProcess/API/glib/"
+ r"|Source/WebKit/Shared/API/glib/"
+ r"|Source/WebKit/WebProcess/InjectedBundle/API/gtk/"
+ r"|Source/WebKit/WebProcess/InjectedBundle/API/glib/",
},
"CoordinatedGraphics": {
- "filename": r"Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/"
- r"|Source/WebKit2/UIProcess/CoordinatedGraphics/"
- r"|Source/WebKit2/Shared/CoordinatedGraphics/"
+ "filename": r"Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/"
+ r"|Source/WebKit/UIProcess/CoordinatedGraphics/"
+ r"|Source/WebKit/Shared/CoordinatedGraphics/"
r"|Source/WebCore/platform/graphics/surfaces/",
},
"TextureMapper": {
@@ -319,7 +319,7 @@
r"|Source/WebCore/platform/text/BidiResolver.h",
},
"NetworkCache": {
- "filename": r"Source/WebKit2/NetworkProcess/cache/",
+ "filename": r"Source/WebKit/NetworkProcess/cache/",
},
"WebCryptoAPI": {
"filename": r"Source/WebCore/crypto/"
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (219485 => 219486)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2017-07-14 02:29:22 UTC (rev 219486)
@@ -310,19 +310,19 @@
_SKIPPED_FILES_WITH_WARNING = [
os.path.join('Tools', 'TestWebKitAPI', 'Tests', 'WebKitGtk'),
- # 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.
- re.compile(re.escape(os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
- re.compile(re.escape(os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
- re.compile(re.escape(os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
- re.compile(re.escape(os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
+ # 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.
+ re.compile(re.escape(os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
+ re.compile(re.escape(os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
+ re.compile(re.escape(os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
+ re.compile(re.escape(os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'wpe') + os.path.sep) + r'WebKit(?!.*Private\.h).*\.h$'),
# GObject DOM bindings copied from generated code using different coding style.
- os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'DOM'),
+ os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'DOM'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
- os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'wpe', 'webkit.h'),
- os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'webkit-web-extension.h'),
- os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'wpe', 'webkit-web-extension.h')]
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk', 'webkit2.h'),
+ os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'wpe', 'webkit.h'),
+ os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk', 'webkit-web-extension.h'),
+ os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'wpe', 'webkit-web-extension.h')]
# Files to skip that are more common or obvious.
#
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py (219485 => 219486)
--- trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/featuredefines.py 2017-07-14 02:29:22 UTC (rev 219486)
@@ -33,7 +33,7 @@
"Source/WebCore/Configurations/FeatureDefines.xcconfig",
"Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig",
"Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig",
- "Source/WebKit2/Configurations/FeatureDefines.xcconfig",
+ "Source/WebKit/Configurations/FeatureDefines.xcconfig",
"Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig",
]
Modified: trunk/Tools/gtk/make-dist.py (219485 => 219486)
--- trunk/Tools/gtk/make-dist.py 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/gtk/make-dist.py 2017-07-14 02:29:22 UTC (rev 219486)
@@ -283,7 +283,7 @@
if arguments.version is not None:
return
- pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-4.0.pc")
+ pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkitgtk-4.0.pc")
if os.path.isfile(pkgconfig_file):
p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
version = p.communicate()[0]
Modified: trunk/Tools/gtk/manifest.txt.in (219485 => 219486)
--- trunk/Tools/gtk/manifest.txt.in 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/Tools/gtk/manifest.txt.in 2017-07-14 02:29:22 UTC (rev 219486)
@@ -60,11 +60,11 @@
exclude Source/WebInspectorUI/Tools
exclude Source/WebInspectorUI/UserInterface/Images
-exclude Source/WebKit2/Resources
-exclude Source/WebKit2/gtk/NEWS$
+exclude Source/WebKit/Resources
+exclude Source/WebKit/gtk/NEWS$
# We do want to include the NEWS, but we want it to be in the root of the archive.
-file Source/WebKit2/gtk/NEWS NEWS
+file Source/WebKit/gtk/NEWS NEWS
directory Source/WebInspectorUI/UserInterface/Images/gtk
file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
Modified: trunk/WebKit.xcworkspace/contents.xcworkspacedata (219485 => 219486)
--- trunk/WebKit.xcworkspace/contents.xcworkspacedata 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/WebKit.xcworkspace/contents.xcworkspacedata 2017-07-14 02:29:22 UTC (rev 219486)
@@ -26,7 +26,7 @@
location = "group:Source/WebKitLegacy/WebKitLegacy.xcodeproj">
</FileRef>
<FileRef
- location = "group:Source/WebKit2/WebKit2.xcodeproj">
+ location = "group:Source/WebKit/WebKit2.xcodeproj">
</FileRef>
<FileRef
location = "group:Source/ThirdParty/gtest/xcode/gtest.xcodeproj">
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (219485 => 219486)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2017-07-14 02:29:17 UTC (rev 219485)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2017-07-14 02:29:22 UTC (rev 219486)
@@ -146,7 +146,7 @@
BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
BuildableName = "All"
BlueprintName = "All"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
+ ReferencedContainer = "container:Source/WebKit/WebKit2.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
