watchOS engineering build is broken after r234227
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jul 2018 00:48:50 +0000 (00:48 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jul 2018 00:48:50 +0000 (00:48 +0000)
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 JavaScriptCore headers
entirely, since there's no relevant version to replace them with.

* postprocess-headers.sh:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/postprocess-headers.sh

index 55c98f2..617a03f 100644 (file)
@@ -1,3 +1,20 @@
+2018-07-30  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        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 JavaScriptCore headers
+        entirely, since there's no relevant version to replace them with.
+
+        * postprocess-headers.sh:
+
 2018-07-30  Keith Miller  <keith_miller@apple.com>
 
         Clarify conversion rules for JSValue property access API
index fcde8a1..fd28836 100755 (executable)
@@ -76,7 +76,11 @@ function rewrite_headers () {
             -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[*]})