Build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jun 2015 14:19:28 +0000 (14:19 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jun 2015 14:19:28 +0000 (14:19 +0000)
* mac/postprocess-framework-headers.sh:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185590 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/mac/postprocess-framework-headers.sh

index cb82eaa..9b356d0 100644 (file)
@@ -1,3 +1,9 @@
+2015-06-16  Dan Bernstein  <mitz@apple.com>
+
+        Build fix.
+
+        * mac/postprocess-framework-headers.sh:
+
 2015-06-16  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r185552.
index 85f8d3e..a4986d5 100755 (executable)
@@ -62,21 +62,24 @@ function rewrite_headers () {
         -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