Title: [234401] trunk/Source/_javascript_Core
- Revision
- 234401
- Author
- [email protected]
- Date
- 2018-07-30 17:48:50 -0700 (Mon, 30 Jul 2018)
Log Message
watchOS engineering build is broken after r234227
https://bugs.webkit.org/show_bug.cgi?id=188180
Reviewed by Keith Miller.
In the case where we're building with a `PLATFORM_NAME` of neither "macosx" nor "iphone*",
postprocess-headers.sh attempts to delete any usage of the JSC availability macros. However,
`JSC_MAC_VERSION_TBA` and `JSC_IOS_VERSION_TBA` still remain, and JSValue.h's usage of
`JSC_IOS_VERSION_TBA` causes engineering watchOS builds to fail.
To fix this, simply allow the fallback path to remove these macros from _javascript_Core headers
entirely, since there's no relevant version to replace them with.
* postprocess-headers.sh:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (234400 => 234401)
--- trunk/Source/_javascript_Core/ChangeLog 2018-07-31 00:35:46 UTC (rev 234400)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-07-31 00:48:50 UTC (rev 234401)
@@ -1,3 +1,20 @@
+2018-07-30 Wenson Hsieh <[email protected]>
+
+ watchOS engineering build is broken after r234227
+ https://bugs.webkit.org/show_bug.cgi?id=188180
+
+ Reviewed by Keith Miller.
+
+ In the case where we're building with a `PLATFORM_NAME` of neither "macosx" nor "iphone*",
+ postprocess-headers.sh attempts to delete any usage of the JSC availability macros. However,
+ `JSC_MAC_VERSION_TBA` and `JSC_IOS_VERSION_TBA` still remain, and JSValue.h's usage of
+ `JSC_IOS_VERSION_TBA` causes engineering watchOS builds to fail.
+
+ To fix this, simply allow the fallback path to remove these macros from _javascript_Core headers
+ entirely, since there's no relevant version to replace them with.
+
+ * postprocess-headers.sh:
+
2018-07-30 Keith Miller <[email protected]>
Clarify conversion rules for JSValue property access API
Modified: trunk/Source/_javascript_Core/postprocess-headers.sh (234400 => 234401)
--- trunk/Source/_javascript_Core/postprocess-headers.sh 2018-07-31 00:35:46 UTC (rev 234400)
+++ trunk/Source/_javascript_Core/postprocess-headers.sh 2018-07-31 00:48:50 UTC (rev 234401)
@@ -76,7 +76,11 @@
-e "s/^JSC_CLASS_DEPRECATED/JSC_EXTERN API_DEPRECATED/"
)
else
- SED_OPTIONS+=(-e 's/JSC_(API_|CLASS_)AVAILABLE\(.*\)\s*\)//g' -e 's/JSC_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?\(.*\)\s*\)//g')
+ SED_OPTIONS+=(
+ -e 's/JSC_(API_|CLASS_)AVAILABLE\(.*\)\s*\)//g'
+ -e 's/JSC_(API_|CLASS_)DEPRECATED(_WITH_REPLACEMENT)?\(.*\)\s*\)//g'
+ -e 's/JSC_(MAC|IOS)_VERSION_TBA/0/g'
+ )
fi
SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
