<!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>[185545] 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/185545">185545</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-06-14 14:00:41 -0700 (Sun, 14 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Clean up postprocess-framework-headers.sh
https://bugs.webkit.org/show_bug.cgi?id=145962
Reviewed by Darin Adler.
* mac/postprocess-framework-headers.sh: Gather all the sed options in a variable, and then
run sed only once on each header. Also, correctly exit with the sed return value if it
fails.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2macpostprocessframeworkheaderssh">trunk/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185544 => 185545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-14 08:37:01 UTC (rev 185544)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-14 21:00:41 UTC (rev 185545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-14 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Clean up postprocess-framework-headers.sh
+ https://bugs.webkit.org/show_bug.cgi?id=145962
+
+ Reviewed by Darin Adler.
+
+ * mac/postprocess-framework-headers.sh: Gather all the sed options in a variable, and then
+ run sed only once on each header. Also, correctly exit with the sed return value if it
+ fails.
+
</ins><span class="cx"> 2015-06-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
</span></span></pre></div>
<a id="trunkSourceWebKit2macpostprocessframeworkheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (185544 => 185545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-14 08:37:01 UTC (rev 185544)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-14 21:00:41 UTC (rev 185545)
</span><span class="lines">@@ -57,16 +57,36 @@
</span><span class="cx"> [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+ SED_OPTIONS=(
+ -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
+ -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
+ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/
+ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/
+ -e s/WK_AVAILABLE/NS_AVAILABLE/
+ -e s/WK_DEPRECATED/NS_DEPRECATED/
+ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/
+ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/
+ -e s/WK_NULLABLE/nullable/g
+ -e s/WK_NULLABLE_PROPERTY/nullable,/
+ -e s/WK_NULLABLE_SPECIFIER/__nullable/g
+ -e s/WK_NULL_UNSPECIFIED/null_unspecified/
+ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/
+ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/
+ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
+ )
+
+ if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
+ SED_OPTIONS+=(-e s/WK_MAC_TBA/${OSX_VERSION}/g -e s/WK_IOS_TBA/${IOS_VERSION}/g)
+ else
+ SED_OPTIONS+=(-e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_)?DEPRECATED\(.+\)//g')
+ fi
+
+ SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]})
+
</ins><span class="cx"> for HEADER_PATH in $1/*.h; do
</span><span class="cx"> if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
</span><span class="cx"> ditto ${HEADER_PATH} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/}
</span><del>- if [[ -n "$OSX_VERSION" ]] && [[ -n "$IOS_VERSION" ]]; then
- sed -i .tmp -e s/WK_MAC_TBA/${OSX_VERSION}/g -e s/WK_IOS_TBA/${IOS_VERSION}/g ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
- else
- sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_)?DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
- fi
-
- sed -i .tmp -E -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g' -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g' ${OTHER_SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</del><ins>+ sed -i .tmp -E ${SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $?
</ins><span class="cx"> mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
</span><span class="cx"> fi
</span><span class="cx"> done
</span></span></pre>
</div>
</div>
</body>
</html>