[API] Catalyst SDK headers include a macOS version, not "NA"

rdar://131880764
https://bugs.webkit.org/show_bug.cgi?id=276745

Reviewed by Alexey Proskuryakov.

Treat macOS and Mac Catalyst as separate platforms in
postprocess-header-rule, so that Catalyst does not inherit a macOS
version string to include in its SDK headers. The only version that
matters for Catalyst is iOS--since JavaScriptCore and WebKit are
unzippered, anything importing them must be targeting apple-ios-macabi.

* Source/JavaScriptCore/Scripts/postprocess-header-rule:
* Source/WebKit/Scripts/postprocess-header-rule:

Canonical link: https://commits.webkit.org/281107@main

Author: emw-apple

Source/JavaScriptCore/Scripts/postprocess-header-rule

@@ -50,21 +50,21 @@ if [ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" == "YES" ]; then
 fi
 
 if [[ "${JSC_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
-    if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
+    if [[ "${WK_PLATFORM_NAME}" == "macosx" ]]; then
         [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
         [[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER=${TARGET_MAC_OS_X_VERSION_MAJOR}
         [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
         [[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
-
-        if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
-            # On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
-            local ALIGNED_IOS_VERSION="${LLVM_TARGET_TRIPLE_OS_VERSION#ios}"
-            [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${ALIGNED_IOS_VERSION}
-            [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${ALIGNED_IOS_VERSION%%.*}
-        else
-            [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
-            [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
-        fi
+        [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
+        [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
+    elif [[ "${WK_PLATFORM_NAME}" == "maccatalyst" ]]; then
+        # On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
+        local ALIGNED_IOS_VERSION="${LLVM_TARGET_TRIPLE_OS_VERSION#ios}"
+        [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${ALIGNED_IOS_VERSION}
+        [[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${ALIGNED_IOS_VERSION%%.*}
+        [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
+        [[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER="0"
+        [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
         [[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
     elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
         [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}

Source/WebKit/Scripts/postprocess-header-rule

@@ -47,16 +47,15 @@ process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_defin
 # FIXME: rdar://90704735 (Run unifdef more uniformly on all WebKit.framework headers)
 
 if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
-    if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
+    if [[ "${WK_PLATFORM_NAME}" == "macosx" ]]; then
         [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
         [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
-
-        if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
-            # On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
-            [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${LLVM_TARGET_TRIPLE_OS_VERSION#ios}
-        else
-            [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
-        fi
+        [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
+    elif [[ "${WK_PLATFORM_NAME}" == "maccatalyst" ]]; then
+        # On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
+        [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${LLVM_TARGET_TRIPLE_OS_VERSION#ios}
+        [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
+        [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
     elif [[ "${WK_PLATFORM_NAME}" =~ "iphone" ]]; then
         [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
         [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"