<!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>[180052] 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/180052">180052</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:35:53 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the framework postprocessing phase
https://bugs.webkit.org/show_bug.cgi?id=141544
Reviewed by Dan Bernstein.
Rename WK_API_AVAILABILITY_ENABLED to WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED to better match what
it is we're doing. Also, rename the associated script. Remove a couple of now unnecessary #defines, and
change everything we can to be feature-based instead of OS based.
* Configurations/WebKit.xcconfig:
* Shared/API/Cocoa/WKFoundation.h:
* WebKit2.xcodeproj/project.pbxproj:
* mac/postprocess-framework-headers.sh: Renamed from Source/WebKit2/mac/rewrite-availability-macros.sh.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFoundationh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2macpostprocessframeworkheaderssh">trunk/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2macrewriteavailabilitymacrossh">trunk/Source/WebKit2/mac/rewrite-availability-macros.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180051 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-13 17:32:14 UTC (rev 180051)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-12 Anders Carlsson <andersca@apple.com>
+
+ Clean up the framework postprocessing phase
+ https://bugs.webkit.org/show_bug.cgi?id=141544
+
+ Reviewed by Dan Bernstein.
+
+ Rename WK_API_AVAILABILITY_ENABLED to WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED to better match what
+ it is we're doing. Also, rename the associated script. Remove a couple of now unnecessary #defines, and
+ change everything we can to be feature-based instead of OS based.
+
+ * Configurations/WebKit.xcconfig:
+ * Shared/API/Cocoa/WKFoundation.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * mac/postprocess-framework-headers.sh: Renamed from Source/WebKit2/mac/rewrite-availability-macros.sh.
+
</ins><span class="cx"> 2015-02-12 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash removing RemoteLayerTreeDisplayRefreshMonitor from the drawing area's map
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (180051 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-02-13 17:32:14 UTC (rev 180051)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx">
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx">
</span><del>-WK_API_AVAILABILITY_ENABLED[sdk=iphone*] = YES;
-WK_API_AVAILABILITY_ENABLED = $(WK_API_AVAILABILITY_ENABLED_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
-WK_API_AVAILABILITY_ENABLED_macosx_1090 = NO;
-WK_API_AVAILABILITY_ENABLED_macosx_101000 = YES;
-WK_API_AVAILABILITY_ENABLED_macosx_101100 = YES;
</del><ins>+WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED[sdk=iphone*] = YES;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED_macosx_1090 = NO;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED_macosx_101000 = NO;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED_macosx_101100 = YES;
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (180051 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-02-13 17:32:14 UTC (rev 180051)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -34,46 +34,39 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef __NSi_10_11
-#define __NSi_10_11 introduced=10.11
-#endif
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> #define WK_EXTERN extern "C" __attribute__((visibility ("default")))
</span><span class="cx"> #else
</span><span class="cx"> #define WK_EXTERN extern __attribute__((visibility ("default")))
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef WK_API_AVAILABILITY_ENABLED
</del><ins>+#ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
+
</ins><span class="cx"> #define WK_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
</span><span class="cx"> #define WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
</span><span class="cx"> #define WK_ENUM_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_ENUM_AVAILABLE_IOS(_ios)
</span><span class="cx">
</span><del>-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-
-#define WK_DESIGNATED_INITIALIZER
-#define WK_UNAVAILABLE
-
</del><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101000
-typedef NSUInteger NSEventModifierFlags;
</del><ins>+#ifdef NS_DESIGNATED_INITIALIZER
+#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
+#else
+#define WK_DESIGNATED_INITIALIZER
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1090
-typedef NSInteger NSURLSessionAuthChallengeDisposition;
</del><ins>+#ifdef NS_UNAVAILABLE
+#define WK_UNAVAILABLE NS_UNAVAILABLE
+#else
+#define WK_UNAVAILABLE
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101000
+typedef NSUInteger NSEventModifierFlags;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#else
-
-#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
-#define WK_UNAVAILABLE NS_UNAVAILABLE
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif
</del><ins>+#endif // !defined(WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (180051 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-02-13 17:32:14 UTC (rev 180051)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -2231,7 +2231,7 @@
</span><span class="cx"> 1A1B0EB318A424950038481A /* WKNavigationResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationResponse.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A1B0EB418A424950038481A /* WKNavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponse.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationResponseInternal.h; sourceTree = "<group>"; };
</span><del>- 1A1D2116191D995C0001619F /* rewrite-availability-macros.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "rewrite-availability-macros.sh"; path = "mac/rewrite-availability-macros.sh"; sourceTree = "<group>"; };
</del><ins>+ 1A1D2116191D995C0001619F /* postprocess-framework-headers.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "postprocess-framework-headers.sh"; path = "mac/postprocess-framework-headers.sh"; sourceTree = "<group>"; };
</ins><span class="cx"> 1A1D2117191D996C0001619F /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; lastKnownFileType = text; name = MigrateHeadersFromWebKitLegacy.make; path = mac/MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
</span><span class="cx"> 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabase.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4195,7 +4195,7 @@
</span><span class="cx"> 32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */,
</span><span class="cx"> C0CE72DB1247E8F700BC0EC4 /* DerivedSources.make */,
</span><span class="cx"> 1A1D2117191D996C0001619F /* MigrateHeadersFromWebKitLegacy.make */,
</span><del>- 1A1D2116191D995C0001619F /* rewrite-availability-macros.sh */,
</del><ins>+ 1A1D2116191D995C0001619F /* postprocess-framework-headers.sh */,
</ins><span class="cx"> BC2E6E74114196F000A63B1E /* Platform */,
</span><span class="cx"> 1AADDF4B10D82AF000D3D63D /* Shared */,
</span><span class="cx"> BC032DC310F438260058C15A /* UIProcess */,
</span><span class="lines">@@ -8470,7 +8470,7 @@
</span><span class="cx"> 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */,
</span><span class="cx"> 375A248817E5048E00C9A086 /* Postprocess WKBase.h */,
</span><span class="cx"> 1AD98ECF191D867300CAA6DF /* Postprocess WKFoundation.h */,
</span><del>- 1A1D2115191D96380001619F /* Rewrite Availability Macros in Framework Headers */,
</del><ins>+ 1A1D2115191D96380001619F /* Postprocess Framework Headers */,
</ins><span class="cx"> 8DC2EF520486A6940098B216 /* Resources */,
</span><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
</span><span class="cx"> 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
</span><span class="lines">@@ -8881,19 +8881,19 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\nmkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\necho \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\nexit 1\nfi\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
</span><span class="cx"> };
</span><del>- 1A1D2115191D96380001619F /* Rewrite Availability Macros in Framework Headers */ = {
</del><ins>+ 1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> );
</span><span class="cx"> inputPaths = (
</span><span class="cx"> );
</span><del>- name = "Rewrite Availability Macros in Framework Headers";
</del><ins>+ name = "Postprocess Framework Headers";
</ins><span class="cx"> outputPaths = (
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n exec ${SRCROOT}/mac/rewrite-availability-macros.sh\nfi";
</del><ins>+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n exec ${SRCROOT}/mac/postprocess-framework-headers.sh\nfi";
</ins><span class="cx"> };
</span><span class="cx"> 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -8922,7 +8922,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ ${WK_API_AVAILABILITY_ENABLED} == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-DWK_API_AVAILABILITY_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-UWK_API_AVAILABILITY_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n rm ${WKFOUNDATION_H}.unifdef\n ;;\n1)\n mv ${WKFOUNDATION_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</del><ins>+ shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ ${WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED} == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n rm ${WKFOUNDATION_H}.unifdef\n ;;\n1)\n mv ${WKFOUNDATION_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</ins><span class="cx"> };
</span><span class="cx"> 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourceWebKit2macpostprocessframeworkheadersshfromrev180051trunkSourceWebKit2macrewriteavailabilitymacrossh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (from rev 180051, trunk/Source/WebKit2/mac/rewrite-availability-macros.sh) (0 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (rev 0)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+#!/bin/sh
+#
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [[ ${WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED} == "NO" ]]; then
+ exit 0;
+fi
+
+TIMESTAMP_PATH=${TARGET_TEMP_DIR}/${0##*/}
+
+if [[ -e $TIMESTAMP_PATH && $0 -nt $TIMESTAMP_PATH ]]; then
+ rm "${TIMESTAMP_PATH}";
+fi
+
+function rewrite_headers () {
+ if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
+ OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET/\./_}
+ IOS_VERSION="NA"
+ else
+ IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET/\./_}
+ OSX_VERSION="NA"
+ fi
+
+ for HEADER_PATH in $1/*.h; do
+ if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
+ sed -e s/WK_MAC_TBA/${OSX_VERSION}/ -e s/WK_IOS_TBA/${IOS_VERSION}/ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -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_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_NULLABLE_PROPERTY/nullable,/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
+ mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
+ fi
+ done
+}
+
+rewrite_headers ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
+rewrite_headers ${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}
+
+touch ${TIMESTAMP_PATH}
</ins></span></pre></div>
<a id="trunkSourceWebKit2macrewriteavailabilitymacrossh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/mac/rewrite-availability-macros.sh (180051 => 180052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2015-02-13 17:32:14 UTC (rev 180051)
+++ trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2015-02-13 17:35:53 UTC (rev 180052)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-#!/bin/sh
-#
-# Copyright (C) 2014 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-if [[ ${WK_API_AVAILABILITY_ENABLED} == "NO" ]]; then
- exit 0;
-fi
-
-TIMESTAMP_PATH=${TARGET_TEMP_DIR}/${0##*/}
-
-if [[ -e $TIMESTAMP_PATH && $0 -nt $TIMESTAMP_PATH ]]; then
- rm "${TIMESTAMP_PATH}";
-fi
-
-function rewrite_headers () {
- if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
- OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET/\./_}
- IOS_VERSION="NA"
- else
- IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET/\./_}
- OSX_VERSION="NA"
- fi
-
- for HEADER_PATH in $1/*.h; do
- if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
- sed -e s/WK_MAC_TBA/${OSX_VERSION}/ -e s/WK_IOS_TBA/${IOS_VERSION}/ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -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_UNAVAILABLE/NS_UNAVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
- mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
- fi
- done
-}
-
-rewrite_headers ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
-rewrite_headers ${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}
-
-touch ${TIMESTAMP_PATH}
</del></span></pre>
</div>
</div>
</body>
</html>