Title: [181004] trunk/Source/WebKit2
- Revision
- 181004
- Author
- [email protected]
- Date
- 2015-03-04 10:48:50 -0800 (Wed, 04 Mar 2015)
Log Message
Remove WK_AVAILABLE and related macros when we cannot determine iOS/Mac version
https://bugs.webkit.org/show_bug.cgi?id=142252
rdar://problem/19983833
Reviewed by David Kilzer.
When mac / ios version was unable to be determined strip the WK_AVAILABLE
and WK_DEPRECATED macros to avoid outputing a broken macro.
* mac/postprocess-framework-headers.sh:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181003 => 181004)
--- trunk/Source/WebKit2/ChangeLog 2015-03-04 18:40:08 UTC (rev 181003)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-04 18:48:50 UTC (rev 181004)
@@ -1,3 +1,16 @@
+2015-03-04 Joseph Pecoraro <[email protected]>
+
+ Remove WK_AVAILABLE and related macros when we cannot determine iOS/Mac version
+ https://bugs.webkit.org/show_bug.cgi?id=142252
+ rdar://problem/19983833
+
+ Reviewed by David Kilzer.
+
+ When mac / ios version was unable to be determined strip the WK_AVAILABLE
+ and WK_DEPRECATED macros to avoid outputing a broken macro.
+
+ * mac/postprocess-framework-headers.sh:
+
2015-03-04 Debarshi Ray <[email protected]>
[GTK] WebView should hold a reference on WebContext because non-default contexts are a reality
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (181003 => 181004)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-03-04 18:40:08 UTC (rev 181003)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-03-04 18:48:50 UTC (rev 181004)
@@ -41,15 +41,20 @@
elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET/\./_}
OSX_VERSION="NA"
- else
- IOS_VERSION="9_0"
- 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_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/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
- mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
+ 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_DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
+ fi
+
+ sed -i .tmp -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_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/ ${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
