Changeset 185347 in webkit

Timestamp:

Jun 8, 2015, 7:31:27 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Use generics in framework headers
​https://bugs.webkit.org/show_bug.cgi?id=145781

Reviewed by Sam Weinig.

• mac/postprocess-framework-headers.sh: Use the parameter to WK_ARRAY and WK_SET.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• mac/postprocess-framework-headers.sh (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-08  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Use generics in framework headers
+        https://bugs.webkit.org/show_bug.cgi?id=145781
+
+        Reviewed by Sam Weinig.
+
+        * mac/postprocess-framework-headers.sh: Use the parameter to WK_ARRAY and WK_SET.
+
 2015-06-08  Chris Dumez  <cdumez@apple.com>
 

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

@@ -67 +67 @@
             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/ ${OTHER_SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
+            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 $_
             mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
         fi
@@ -75 +75 @@
 DEFINITIONS_PATH=usr/local/include/WebKitAdditions/Scripts/postprocess-framework-headers-definitions
 
-# FIXME: Remove this.
-OTHER_SED_OPTIONS=(-e 's/WK_SET\([^\)]+\)/NSSet/g' -e 's/WK_ARRAY\([^\)]+\)/NSArray/g')
-
 process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_definitions "${SDKROOT}/${DEFINITIONS_PATH}"