Add macos_kernel_version() and tests

This provides the reverse mapping for `macos_version()`.

Author: staticfloat

BinaryBuilderPlatformExtensions.jl/src/PlatformProperties.jl

@@ -1,4 +1,4 @@
-export macos_version, nbits, proc_family, exeext, dlext
+export macos_version, macos_kernel_version, nbits, proc_family, exeext, dlext
 
 function macos_version(kernel_version::Integer)
     # See https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
@@ -13,9 +13,35 @@ function macos_version(kernel_version::Integer)
         19 => "10.15",
         20 => "11.0",
         21 => "12.0",
+        22 => "13.0",
+        23 => "14.0",
+        24 => "15.0",
     )
     return get(kernel_to_macos, kernel_version, nothing)
 end
+macos_version(v::VersionNumber) = macos_version(v.major)
+
+"""
+    macos_kernel_version(v::VersionNumber)
+
+Return the kernel version from a macOS VersionNumber, e.g. when given
+`10.10`` return `14`.  If given a VersionNumber outside of what we
+understand, return the closest valid number.
+"""
+function macos_kernel_version(v::VersionNumber)
+    if v.major < 10
+        return 12
+    elseif v.major == 10
+        if v.minor <= 8
+            return 12
+        else
+            return min(12 + (v.minor - 8), 19)
+        end
+    else
+        return 20 + (v.major - 11)
+    end
+end
+macos_kernel_version(s::String) = macos_kernel_version(VersionNumber(s))
 
 """
     macos_version(p::AbstractPlatform)
@@ -38,6 +64,16 @@ function macos_version(p::AbstractPlatform)
     return macos_version(os_version(p))
 end
 
+function macos_kernel_version(p::AbstractPlatform)
+    if os(p) != "macos"
+        return nothing
+    end
+    if os_version(p) === nothing
+        return nothing
+    end
+    return Int(os_version(p).major)
+end
+
 
 """
     nbits(p::AbstractPlatform)

BinaryBuilderPlatformExtensions.jl/test/runtests.jl

@@ -211,6 +211,18 @@ using BinaryBuilderPlatformExtensions, Test, Base.BinaryPlatforms, Artifacts
     end
 end
 
+@testset "macos_version" begin
+    @test macos_version(Platform("x86_64", "macos")) === nothing
+    @test macos_version(Platform("x86_64", "macos"; os_version="14")) === "10.10"
+    @test macos_version(Platform("x86_64", "macos"; os_version="20")) === "11.0"
+    for idx in 12:24
+        p = Platform("aarch64", "macos"; os_version=string(idx))
+        @test macos_version(p) !== nothing
+        @test macos_kernel_version(p) == idx
+        @test macos_kernel_version(macos_version(p)) == idx
+    end
+end
+
 @testset "nbits" begin
     for p in [Platform("i686", "linux"), Platform("i686", "windows"), Platform("armv7l", "linux")]
         @test nbits(p) == 32