- Revision
- 173574
- Author
- m...@apple.com
- Date
- 2014-09-12 14:05:01 -0700 (Fri, 12 Sep 2014)
Log Message
[Cocoa] Message generation scripts should be installed in WebKit.framework
https://bugs.webkit.org/show_bug.cgi?id=136771
Reviewed by Anders Carlsson.
* DerivedSources.make: Updated for rename of Scripts/webkit2 to Scripts/webkit.
* Scripts/generate-message-receiver.py:
(main): Updated for rename from webkit2 to webkit.
* Scripts/generate-messages-header.py:
(main): Ditto.
* Scripts/webkit: Renamed from Source/WebKit2/Scripts/webkit2.
* Scripts/webkit/messages.py: Updated for rename.
* Scripts/webkit/parser.py: Ditto.
* WebKit2.xcodeproj/project.pbxproj: Moved the Copy Message Generation Scripts build phase
from the WebKit2 target to the WebKit target and changed its destination to
WebKit.framework/PrivateHeaders/Scripts/webkit. Removed the Remove Compiled Python Files
build phase, since compiled files no longer get copied.
Modified Paths
Added Paths
- trunk/Source/WebKit2/Scripts/webkit/
Removed Paths
- trunk/Source/WebKit2/Scripts/webkit2/
Diff
Modified: trunk/Source/WebKit2/ChangeLog (173573 => 173574)
--- trunk/Source/WebKit2/ChangeLog 2014-09-12 20:59:20 UTC (rev 173573)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-12 21:05:01 UTC (rev 173574)
@@ -1,3 +1,23 @@
+2014-09-12 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Message generation scripts should be installed in WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=136771
+
+ Reviewed by Anders Carlsson.
+
+ * DerivedSources.make: Updated for rename of Scripts/webkit2 to Scripts/webkit.
+ * Scripts/generate-message-receiver.py:
+ (main): Updated for rename from webkit2 to webkit.
+ * Scripts/generate-messages-header.py:
+ (main): Ditto.
+ * Scripts/webkit: Renamed from Source/WebKit2/Scripts/webkit2.
+ * Scripts/webkit/messages.py: Updated for rename.
+ * Scripts/webkit/parser.py: Ditto.
+ * WebKit2.xcodeproj/project.pbxproj: Moved the Copy Message Generation Scripts build phase
+ from the WebKit2 target to the WebKit target and changed its destination to
+ WebKit.framework/PrivateHeaders/Scripts/webkit. Removed the Remove Compiled Python Files
+ build phase, since compiled files no longer get copied.
+
2014-09-12 Tim Horton <timothy_hor...@apple.com>
Flash of page scrolled to wrong origin before restoring scroll position after swiping back to CNN front page from an article
Modified: trunk/Source/WebKit2/DerivedSources.make (173573 => 173574)
--- trunk/Source/WebKit2/DerivedSources.make 2014-09-12 20:59:20 UTC (rev 173573)
+++ trunk/Source/WebKit2/DerivedSources.make 2014-09-12 21:05:01 UTC (rev 173574)
@@ -144,10 +144,10 @@
SCRIPTS = \
$(WebKit2)/Scripts/generate-message-receiver.py \
$(WebKit2)/Scripts/generate-messages-header.py \
- $(WebKit2)/Scripts/webkit2/__init__.py \
- $(WebKit2)/Scripts/webkit2/messages.py \
- $(WebKit2)/Scripts/webkit2/model.py \
- $(WebKit2)/Scripts/webkit2/parser.py \
+ $(WebKit2)/Scripts/webkit/__init__.py \
+ $(WebKit2)/Scripts/webkit/messages.py \
+ $(WebKit2)/Scripts/webkit/model.py \
+ $(WebKit2)/Scripts/webkit/parser.py \
#
.PHONY : all
Modified: trunk/Source/WebKit2/Scripts/generate-message-receiver.py (173573 => 173574)
--- trunk/Source/WebKit2/Scripts/generate-message-receiver.py 2014-09-12 20:59:20 UTC (rev 173573)
+++ trunk/Source/WebKit2/Scripts/generate-message-receiver.py 2014-09-12 21:05:01 UTC (rev 173574)
@@ -25,7 +25,7 @@
from __future__ import with_statement
import sys
-import webkit2.messages
+import webkit.messages
def main(argv=None):
@@ -33,8 +33,8 @@
argv = sys.argv
input_path = argv[1]
with open(input_path) as input_file:
- # Python 3, change to: print(webkit2.messages.generate_message_handler(input_file), end='')
- sys.stdout.write(webkit2.messages.generate_message_handler(input_file))
+ # Python 3, change to: print(webkit.messages.generate_message_handler(input_file), end='')
+ sys.stdout.write(webkit.messages.generate_message_handler(input_file))
return 0
if __name__ == '__main__':
Modified: trunk/Source/WebKit2/Scripts/generate-messages-header.py (173573 => 173574)
--- trunk/Source/WebKit2/Scripts/generate-messages-header.py 2014-09-12 20:59:20 UTC (rev 173573)
+++ trunk/Source/WebKit2/Scripts/generate-messages-header.py 2014-09-12 21:05:01 UTC (rev 173574)
@@ -25,7 +25,7 @@
from __future__ import with_statement
import sys
-import webkit2.messages
+import webkit.messages
def main(argv=None):
@@ -33,8 +33,8 @@
argv = sys.argv
input_path = argv[1]
with open(input_path) as input_file:
- # Python 3, change to: print(webkit2.messages.generate_messages_header(input_file), end='')
- sys.stdout.write(webkit2.messages.generate_messages_header(input_file))
+ # Python 3, change to: print(webkit.messages.generate_messages_header(input_file), end='')
+ sys.stdout.write(webkit.messages.generate_messages_header(input_file))
return 0
if __name__ == '__main__':
Property changes: trunk/Source/WebKit2/Scripts/webkit
Added: svn:ignore
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (173573 => 173574)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-12 20:59:20 UTC (rev 173573)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-12 21:05:01 UTC (rev 173574)
@@ -1898,7 +1898,7 @@
1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = PrivateHeaders/webkit2;
+ dstPath = PrivateHeaders/Scripts/webkit;
dstSubfolderSpec = 1;
files = (
1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
@@ -2030,10 +2030,10 @@
0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollingTreeOverflowScrollingNodeIOS.h; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; };
0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
- 0FC0856E187CE0A900780D86 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = __init__.py; path = webkit2/__init__.py; sourceTree = "<group>"; };
- 0FC0856F187CE0A900780D86 /* messages.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = messages.py; path = webkit2/messages.py; sourceTree = "<group>"; };
- 0FC08570187CE0A900780D86 /* model.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = model.py; path = webkit2/model.py; sourceTree = "<group>"; };
- 0FC08571187CE0A900780D86 /* parser.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = parser.py; path = webkit2/parser.py; sourceTree = "<group>"; };
+ 0FC0856E187CE0A900780D86 /* __init__.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = __init__.py; path = webkit/__init__.py; sourceTree = "<group>"; };
+ 0FC0856F187CE0A900780D86 /* messages.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = messages.py; path = webkit/messages.py; sourceTree = "<group>"; };
+ 0FC08570187CE0A900780D86 /* model.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = model.py; path = webkit/model.py; sourceTree = "<group>"; };
+ 0FC08571187CE0A900780D86 /* parser.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = parser.py; path = webkit/parser.py; sourceTree = "<group>"; };
0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageClientImplIOS.h; path = ios/PageClientImplIOS.h; sourceTree = "<group>"; };
0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PageClientImplIOS.mm; path = ios/PageClientImplIOS.mm; sourceTree = "<group>"; };
0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKActionSheet.h; path = ios/WKActionSheet.h; sourceTree = "<group>"; };
@@ -7848,7 +7848,6 @@
buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
buildPhases = (
1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
- 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
1A6280CB191997BD006AD9F9 /* Sources */,
1A6280CC191997BD006AD9F9 /* Frameworks */,
1A6280CD191997BD006AD9F9 /* Headers */,
@@ -7985,7 +7984,7 @@
1A1D2115191D96380001619F /* Rewrite Availability Macros in Framework Headers */,
8DC2EF520486A6940098B216 /* Resources */,
7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
- 5D1A239215E760590023E981 /* Remove Compiled Python Files */,
+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
8DC2EF540486A6940098B216 /* Sources */,
8DC2EF560486A6940098B216 /* Frameworks */,
5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */,
@@ -8486,20 +8485,6 @@
shellPath = /bin/sh;
shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
};
- 5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Remove Compiled Python Files";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "find \"${BUILT_PRODUCTS_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\" -name '*.pyc' -delete";
- };
5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
