From 22b6f42307dda00090d0971e93ea017559e32c54 Mon Sep 17 00:00:00 2001
From: Nursultan Kassan <84095700+kassannk@users.noreply.github.com>
Date: Mon, 7 Jun 2021 16:00:50 +0300
Subject: [PATCH] [macOS] Adding Swig (#3510)

---
 images/macos/software-report/SoftwareReport.Common.psm1   | 5 +++++
 images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++-
 images/macos/tests/Common.Tests.ps1                       | 8 +++++++-
 images/macos/toolsets/toolset-10.14.json                  | 1 +
 images/macos/toolsets/toolset-10.15.json                  | 1 +
 images/macos/toolsets/toolset-11.json                     | 3 ++-
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 928d1aaf..8585cd05 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -487,6 +487,11 @@ function Get-PowershellVersion {
     return $powershellVersion
 }
 
+function Get-SwigVersion {
+    $swigVersion = Run-Command "swig -version" | Select-Object -First 2 | Take-Part -Part 2
+    return "Swig $swigVersion"
+}
+
 function Build-PackageManagementEnvironmentTable {
     return @(
         @{
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index f9532db0..89f455c2 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -159,7 +159,8 @@ $toolsList = @(
     (Get-AWSSAMCLIVersion),
     (Get-AWSSessionManagerCLIVersion),
     (Get-AliyunCLIVersion),
-    (Get-XcodeCommandLineToolsVersion)
+    (Get-XcodeCommandLineToolsVersion),
+    (Get-SwigVersion)
 )
 
 if( -not $os.IsHighSierra) {
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index f066fac4..79f47bb3 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -85,4 +85,10 @@ Describe "VSMac" {
         $vsPath | Should -Exist
         $vstoolPath | Should -Exist
     }
-}
\ No newline at end of file
+}
+
+Describe "Swig" {
+    It "Swig" {
+        "swig -version" | Should -ReturnZeroExitCode
+    }
+}
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index 8e8bf62a..7ed810ee 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -253,6 +253,7 @@
             "perl",
             "subversion",
             "swiftformat",
+            "swig",
             "xctool",
             "zstd"
         ],
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 90952997..eb742fb8 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -205,6 +205,7 @@
             "perl",
             "subversion",
             "swiftformat",
+            "swig",
             "xctool",
             "zstd"
         ],
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 895f0d6e..fe3a52d2 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -151,6 +151,7 @@
             "perl",
             "subversion",
             "swiftformat",
+            "swig",
             "zstd"
         ],
         "cask_packages": [
@@ -239,4 +240,4 @@
         "bundler",
         "fastlane"
     ]
-}
\ No newline at end of file
+}