diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 1530e4866..98d96feb9 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -462,12 +462,6 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ @@ -733,12 +727,6 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 657f76b77..46792679b 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -437,12 +437,6 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ @@ -708,12 +702,6 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Clang.ps1 b/images/win/scripts/Installers/Install-Clang.ps1 deleted file mode 100644 index bd567a972..000000000 --- a/images/win/scripts/Installers/Install-Clang.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -################################################################################ -## File: Install-Clang.ps1 -## Desc: Install Clang compiler as a part of LLVM framework for Windows -################################################################################ - -choco install -y llvm diff --git a/images/win/scripts/Installers/Validate-Clang.ps1 b/images/win/scripts/Installers/Validate-Clang.ps1 deleted file mode 100644 index b785f3d30..000000000 --- a/images/win/scripts/Installers/Validate-Clang.ps1 +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -## File: Validate-Clang.ps1 -## Desc: Validate Clang installation -################################################################################ - -if (Get-Command -Name 'clang') -{ - Write-Host "clang is successfully installed:" - clang --version | Write-Host -} -else -{ - Write-Host "clang is not on PATH" - exit 1 -} - -if (Get-Command -Name 'clang++') -{ - Write-Host "clang++ is successfully installed:" - clang++ --version | Write-Host -} -else -{ - Write-Host "clang++ is not on PATH" - exit 1 -} - -# Adding description of the software to Markdown - -# `clang --version` gives output like: -# clang version 9.0.0 (tags/RELEASE_900/final) -# Target: x86_64-pc-windows-msvc -# Thread model: posix -# InstalledDir: C:\Program Files\LLVM\bin - -$SoftwareName = "Clang" -$(clang --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+" -$Version = $matches[0] - -$Description = @" -_Version:_ $Version
-_Environment:_ -* PATH: contains location of the LLVM 'bin' directory -"@ - -Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description