Title: [185590] trunk/Source/WebKit2
- Revision
- 185590
- Author
- m...@apple.com
- Date
- 2015-06-16 07:19:28 -0700 (Tue, 16 Jun 2015)
Log Message
Build fix.
* mac/postprocess-framework-headers.sh:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185589 => 185590)
--- trunk/Source/WebKit2/ChangeLog 2015-06-16 13:06:07 UTC (rev 185589)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 14:19:28 UTC (rev 185590)
@@ -1,3 +1,9 @@
+2015-06-16 Dan Bernstein <m...@apple.com>
+
+ Build fix.
+
+ * mac/postprocess-framework-headers.sh:
+
2015-06-16 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r185552.
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (185589 => 185590)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-16 13:06:07 UTC (rev 185589)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-16 14:19:28 UTC (rev 185590)
@@ -62,21 +62,24 @@
-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_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_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)
+ SED_OPTIONS+=(
+ -e s/WK_MAC_TBA/${OSX_VERSION}/g
+ -e s/WK_IOS_TBA/${IOS_VERSION}/g
+ -e s/WK_AVAILABLE/NS_AVAILABLE/
+ -e s/WK_DEPRECATED/NS_DEPRECATED/
+ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/
+ -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/
+ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/
+ )
else
SED_OPTIONS+=(-e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_)?DEPRECATED\(.+\)//g')
fi
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
