<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173564] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173564">173564</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 10:30:35 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2Scriptsgeneratemessagereceiverpy">trunk/Source/WebKit2/Scripts/generate-message-receiver.py</a></li>
<li><a href="#trunkSourceWebKit2Scriptsgeneratemessagesheaderpy">trunk/Source/WebKit2/Scripts/generate-messages-header.py</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitparserpy">trunk/Source/WebKit2/Scripts/webkit/parser.py</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Scripts/webkit/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Scripts/webkit2/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-09-12 Dan Bernstein <mitz@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.
+
</ins><span class="cx"> 2014-09-12 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use a nicer HTTP authentication dialog
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DerivedSources.make 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/DerivedSources.make 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -144,10 +144,10 @@
</span><span class="cx"> SCRIPTS = \
</span><span class="cx"> $(WebKit2)/Scripts/generate-message-receiver.py \
</span><span class="cx"> $(WebKit2)/Scripts/generate-messages-header.py \
</span><del>- $(WebKit2)/Scripts/webkit2/__init__.py \
- $(WebKit2)/Scripts/webkit2/messages.py \
- $(WebKit2)/Scripts/webkit2/model.py \
- $(WebKit2)/Scripts/webkit2/parser.py \
</del><ins>+ $(WebKit2)/Scripts/webkit/__init__.py \
+ $(WebKit2)/Scripts/webkit/messages.py \
+ $(WebKit2)/Scripts/webkit/model.py \
+ $(WebKit2)/Scripts/webkit/parser.py \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> .PHONY : all
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptsgeneratemessagereceiverpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/generate-message-receiver.py (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/generate-message-receiver.py 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/Scripts/generate-message-receiver.py 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> from __future__ import with_statement
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-import webkit2.messages
</del><ins>+import webkit.messages
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main(argv=None):
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> argv = sys.argv
</span><span class="cx"> input_path = argv[1]
</span><span class="cx"> with open(input_path) as input_file:
</span><del>- # Python 3, change to: print(webkit2.messages.generate_message_handler(input_file), end='')
- sys.stdout.write(webkit2.messages.generate_message_handler(input_file))
</del><ins>+ # Python 3, change to: print(webkit.messages.generate_message_handler(input_file), end='')
+ sys.stdout.write(webkit.messages.generate_message_handler(input_file))
</ins><span class="cx"> return 0
</span><span class="cx">
</span><span class="cx"> if __name__ == '__main__':
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptsgeneratemessagesheaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/generate-messages-header.py (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/generate-messages-header.py 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/Scripts/generate-messages-header.py 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> from __future__ import with_statement
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-import webkit2.messages
</del><ins>+import webkit.messages
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main(argv=None):
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> argv = sys.argv
</span><span class="cx"> input_path = argv[1]
</span><span class="cx"> with open(input_path) as input_file:
</span><del>- # Python 3, change to: print(webkit2.messages.generate_messages_header(input_file), end='')
- sys.stdout.write(webkit2.messages.generate_messages_header(input_file))
</del><ins>+ # Python 3, change to: print(webkit.messages.generate_messages_header(input_file), end='')
+ sys.stdout.write(webkit.messages.generate_messages_header(input_file))
</ins><span class="cx"> return 0
</span><span class="cx">
</span><span class="cx"> if __name__ == '__main__':
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> import collections
</span><span class="cx"> import re
</span><span class="cx"> import sys
</span><del>-from webkit2 import parser
</del><ins>+from webkit import parser
</ins><span class="cx">
</span><span class="cx"> WANTS_CONNECTION_ATTRIBUTE = 'WantsConnection'
</span><span class="cx"> LEGACY_RECEIVER_ATTRIBUTE = 'LegacyReceiver'
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitparserpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/parser.py (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/parser.py 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/Scripts/webkit/parser.py 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> import re
</span><span class="cx">
</span><del>-from webkit2 import model
</del><ins>+from webkit import model
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def combine_condition(conditions):
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (173563 => 173564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-12 17:17:10 UTC (rev 173563)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-09-12 17:30:35 UTC (rev 173564)
</span><span class="lines">@@ -1898,7 +1898,7 @@
</span><span class="cx"> 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
</span><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><del>- dstPath = PrivateHeaders/webkit2;
</del><ins>+ dstPath = PrivateHeaders/Scripts/webkit;
</ins><span class="cx"> dstSubfolderSpec = 1;
</span><span class="cx"> files = (
</span><span class="cx"> 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
</span><span class="lines">@@ -2030,10 +2030,10 @@
</span><span class="cx"> 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollingTreeOverflowScrollingNodeIOS.h; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 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>"; };
</ins><span class="cx"> 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageClientImplIOS.h; path = ios/PageClientImplIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PageClientImplIOS.mm; path = ios/PageClientImplIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKActionSheet.h; path = ios/WKActionSheet.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7848,7 +7848,6 @@
</span><span class="cx"> buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
</span><span class="cx"> buildPhases = (
</span><span class="cx"> 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
</span><del>- 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
</del><span class="cx"> 1A6280CB191997BD006AD9F9 /* Sources */,
</span><span class="cx"> 1A6280CC191997BD006AD9F9 /* Frameworks */,
</span><span class="cx"> 1A6280CD191997BD006AD9F9 /* Headers */,
</span><span class="lines">@@ -7985,7 +7984,7 @@
</span><span class="cx"> 1A1D2115191D96380001619F /* Rewrite Availability Macros in Framework Headers */,
</span><span class="cx"> 8DC2EF520486A6940098B216 /* Resources */,
</span><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
</span><del>- 5D1A239215E760590023E981 /* Remove Compiled Python Files */,
</del><ins>+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
</ins><span class="cx"> 8DC2EF540486A6940098B216 /* Sources */,
</span><span class="cx"> 8DC2EF560486A6940098B216 /* Frameworks */,
</span><span class="cx"> 5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */,
</span><span class="lines">@@ -8486,20 +8485,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> 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";
</span><span class="cx"> };
</span><del>- 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";
- };
</del><span class="cx"> 5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span></span></pre>
</div>
</div>
</body>
</html>