From 2889cfe878d0bdbd38055c2055e23ce2c9934fc0 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 8 Oct 2024 01:25:07 -0700 Subject: [PATCH] [macOS] Add tcl-tk to macOS13 and macOS14 (#10735) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +++- images/macos/toolsets/toolset-13.json | 1 + images/macos/toolsets/toolset-14.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 149793732..a7a8d6bd0 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -293,9 +293,11 @@ if ($os.IsMonterey) { $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) } -if ($os.IsSonomaX64 -or $os.IsVenturaX64 -or $os.IsSequoiaX64) { +if ($os.IsSonoma -or $os.IsVentura) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") + $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) } + if ($os.IsMonterey -or $os.IsSonomaX64 -or $os.IsVenturaX64) { Write-Host "Adding environment variables for parallels" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ea8e8ab37..d5e13ee94 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -74,6 +74,7 @@ "perl", "pkg-config", "swiftformat", + "tcl-tk", "zstd", "gmp", "yq", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 0f66b0837..3ed229dce 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -79,6 +79,7 @@ "perl", "pkg-config", "swiftformat", + "tcl-tk", "zstd", "gmp", "yq",