From 2f746bd4b63f398bc029f3e7555b32f9ad94f8de Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 22 Aug 2022 17:17:00 -0700 Subject: [PATCH] remove setup and checking of 'sort' in the Windows build Building Graphviz has not required the `sort` utility since ea6b4c99ec32127619b6e5c3a5ff58be51aa4829. --- windows/bin/setup-build-utilities.ps1 | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/windows/bin/setup-build-utilities.ps1 b/windows/bin/setup-build-utilities.ps1 index a3081ba70..f05c68bb9 100644 --- a/windows/bin/setup-build-utilities.ps1 +++ b/windows/bin/setup-build-utilities.ps1 @@ -60,17 +60,6 @@ if (-NOT (cpack.exe --help | Select-String 'CPACK_GENERATOR')) { $Env:Path="$CMAKE_BIN;$path" } -$ErrorActionPreference = "Continue" -if (-NOT (sort.exe /? 2>$null | Select-String "SORT")) { - $ErrorActionPreference = "Stop" - echo "Moving C:\WINDOWS\system32 to front of PATH in order to find Windows' sort" - $Env:Path="C:\WINDOWS\system32;$Env:Path" -} -$ErrorActionPreference = "Stop" - -$script:all_programs += " sort" - - echo "Final check where all utilites are found:" $script:all_programs.Trim().Split(" ") | ForEach { @@ -91,15 +80,6 @@ if (-NOT (cpack.exe --help | Select-String 'CPACK_GENERATOR')) { $exit_status = 1 } -$ErrorActionPreference = "Continue" -if (-NOT (sort.exe /? 2>$null | Select-String "SORT")) { - $ErrorActionPreference = "Stop" - $exe = (Get-Command sort.exe 2>$null).Source - Write-Error -EA Continue "Found an unknown sort at $exe" - $exit_status = 1 -} -$ErrorActionPreference = "Stop" - if ($exit_status -eq 0) { echo "All utilities have been found. Happy building!" } else { -- 2.40.0