Title: [185545] trunk/Source/WebKit2
- Revision
- 185545
- Author
- [email protected]
- Date
- 2015-06-14 14:00:41 -0700 (Sun, 14 Jun 2015)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185544 => 185545)
--- 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)
@@ -1,3 +1,14 @@
+2015-06-14 Dan Bernstein <[email protected]>
+
+ [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.
+
2015-06-13 Chris Dumez <[email protected]>
[WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (185544 => 185545)
--- 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)
@@ -57,16 +57,36 @@
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
fi
+ 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[*]})
+
for HEADER_PATH in $1/*.h; do
if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
ditto ${HEADER_PATH} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/}
- 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 $_
+ sed -i .tmp -E ${SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $?
mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
fi
done
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
