X-Git-Url: https://vilimpoc.org/repos/dotfiles/blobdiff_plain/fbe899b67d263a1ae5404d3ed25f5f091c3d2c1e..d254a9bebd5448269d34a5c6dfcd36b646659b31:/setup-windows-no-uac.ps1?ds=sidebyside diff --git a/setup-windows-no-uac.ps1 b/setup-windows-no-uac.ps1 index 1fd2c1f..50cdd89 100644 --- a/setup-windows-no-uac.ps1 +++ b/setup-windows-no-uac.ps1 @@ -11,15 +11,13 @@ elevated would configure the *administrator's* profile instead of yours. What this installs / configures: - - WinMerge on the user PATH + - WinMerge on the user PATH (x64 only) - vswhere.exe on the user PATH: the Visual Studio installer puts it in %ProgramFiles(x86)%\Microsoft Visual Studio\Installer, which nothing adds to the PATH, so build scripts (and VsDevCmd.bat itself) complain that 'vswhere.exe' is not recognized - BinSkim (binary hardening analyzer) in %LOCALAPPDATA%\Programs\BinSkim, - on the user PATH. The package has no win-arm64 build, so on ARM64 this is - the x64 tool under emulation - which analyses ARM64 binaries fine, since it - only reads their headers. + on the user PATH (x64 only - the NuGet package publishes win-x64 alone) - Global git identity, and core.sshCommand pointed at a Win32-OpenSSH client so git shares the Windows ssh-agent: the fast ssh.exe the elevated half unpacks beside rsync.exe if it is there, the in-box one otherwise @@ -46,11 +44,36 @@ param( $ErrorActionPreference = 'Stop' -# Host architecture. RuntimeInformation rather than PROCESSOR_ARCHITECTURE: an -# emulated PowerShell reports the emulated architecture in the environment -# variable while this API reports the real one. Values: X64, Arm64, X86. -$HostArch = [Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString() -$IsArm64 = ($HostArch -eq 'Arm64') +# Host architecture, from the machine environment in the registry. Both of the +# obvious sources report the EMULATED architecture inside an emulated x64 +# PowerShell - which is what `powershell` resolves to when launched from an x64 +# shell on an ARM64 box. Measured on this machine: +# [RuntimeInformation]::OSArchitecture X64 <- wrong +# $env:PROCESSOR_ARCHITECTURE AMD64 <- wrong +# HKLM\...\Session Manager\Environment ARM64 <- right +# OSArchitecture is documented as the OS's architecture, and on .NET Core it is; +# under .NET Framework on Prism it is not, so it is kept only as a fallback. +# $IsArm64 decides which steps run at all, so this has to be the real one. +$rawArch = (Get-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -ErrorAction SilentlyContinue).PROCESSOR_ARCHITECTURE +if (-not $rawArch) { $rawArch = [Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString() } +$IsArm64 = ($rawArch -eq 'ARM64') +$HostArch = if ($IsArm64) { 'Arm64' } elseif ($rawArch -eq 'AMD64') { 'X64' } else { $rawArch } + +# Steps that do not run on ARM64, with the reason printed in place of the step. +# +# The ARM64 machine is provisioned as a single-compiler build box - see the +# x64-only set in setup-windows.bat - so the packages these three steps wire up +# are not installed there. Skipping the step rather than letting it find nothing +# matters: Install-BinSkim would happily download and PATH the x64 build, and +# Add-LlvmToUserPath is the step that put an emulated-adjacent toolchain on the +# PATH ahead of MSVC in the first place. +# +# -Skip still works on top of this; it can only subtract. +$Arm64Dropped = [ordered]@{ + WinMerge = 'not installed on ARM64 - the only build an unelevated winget can fetch is the emulated x64 one' + BinSkim = 'not installed on ARM64 - the NuGet package publishes win-x64 only' + LlvmPath = 'not installed on ARM64 - this box carries MSVC alone' +} # --- Global git identity: FILL THESE IN BEFORE RUNNING --- # Left empty, Set-GlobalGitConfig skips the identity and says so, rather than @@ -350,7 +373,17 @@ function Set-GlobalGitConfig { # run would otherwise read as success. $global: because a bare assignment # would make a local copy that the native call then does not update. $global:LASTEXITCODE = $null - try { $version = (& $cand -V 2>&1 | Select-Object -First 1) } catch { } + # Collect ALL the output, THEN take its first line. Piped straight into + # `Select-Object -First 1`, which is how this used to read, PowerShell + # stops the pipeline the moment ssh.exe prints its banner - before it + # has exited - kills it, and the exit code comes back -1 instead of 0. + # Measured under Windows PowerShell 5.1 against a healthy + # C:\Tools\rsync\ssh.exe: 19 of 20 runs reported -1 that way, 0 of 20 + # once collected first. So this check usually judged the fast client + # broken and handed git the in-box one it exists to avoid. + # setup-windows-with-uac.ps1 fixed the same trap in its own ssh.exe + # check (see DRAIN THE OUTPUT there); this copy was missed. + try { $sshOut = @(& $cand -V 2>&1); $version = $sshOut[0] } catch { } finally { $ErrorActionPreference = $prevEap } if ($LASTEXITCODE -eq 0) { $winSsh = $cand; break } $why = if ($null -eq $LASTEXITCODE) { 'it would not start' } else { "exit $LASTEXITCODE" } @@ -538,11 +571,16 @@ function Invoke-ArchAudit { # Tools with no native ARM64 build available anywhere, with the reason. These # print as expected rather than as problems - see the README's ARM64 section. + # + # Shorter than it was: BinSkim, OpenCppCoverage and NASM used to be listed + # here as accepted emulation, and are now simply not installed on ARM64. That + # is the whole shape of the change - the exceptions that were tolerable one at + # a time added up to a VM full of x64 binaries. + # + # rsync came off this list when the release started publishing an arm64 + # asset. An x64 rsync.exe on an ARM64 box is now a leftover from a run before + # that, not an accepted exception, so it warns and gets a remedy below. $KnownEmulated = @{ - 'BinSkim.exe' = 'NuGet package publishes win-x64 only; it reads PE headers, so it still analyses ARM64 binaries' - 'rsync.exe' = 'no ARM64 asset published; transfer is socket-bound, not CPU-bound' - 'OpenCppCoverage.exe' = 'x86/x64 only, and cannot instrument ARM64 binaries - run coverage against the x64 build' - 'nasm.exe' = 'x86/x86-64 assembler by definition; ARM64 uses armasm64.exe from MSVC' 'iperf3.exe' = 'no ARM64 build published; network-bound anyway' 'py.exe' = 'python.org ships the launcher shim as x86; it execs the native python.exe' 'vswhere.exe' = 'Microsoft ships x86 only; runs once per script' @@ -556,11 +594,15 @@ function Invoke-ArchAudit { # even on ARM64, and it is re-invoked for every edge in the build graph, so # an emulated one is paid over and over rather than once. The NinjaPath step # puts the native copy first; this is the check that it worked. + # + # Only two left, and both are for tools ARM64 still installs. The clang-cl and + # WinMerge remedies were removed with their rows: advising an install that the + # x64-only set has just declined to do would be the audit arguing with the + # provisioning. $Remedies = @{ - 'ninja.exe' = 'Visual Studio bundles an x64 ninja. Install the native one (winget install Ninja-build.Ninja) and re-run - the NinjaPath step puts its directory at the front of the user PATH.' - 'cmake.exe' = 'Install the native build with: winget install Kitware.CMake (its MSI is machine-scope, so it needs an administrator).' - 'clang-cl.exe' = 'Install the upstream native LLVM with: winget install LLVM.LLVM' - 'WinMergeU.exe' = 'Upstream ships ARM64 as a MACHINE-scope installer and x64 as per-user, so an unelevated winget picks x64. Re-run as an administrator to get: winget install WinMerge.WinMerge --architecture arm64' + 'ninja.exe' = 'Visual Studio bundles an x64 ninja. Install the native one (winget install Ninja-build.Ninja) and re-run - the NinjaPath step puts its directory at the front of the user PATH.' + 'cmake.exe' = 'Install the native build with: winget install Kitware.CMake (its MSI is machine-scope, so it needs an administrator).' + 'rsync.exe' = 'Left over from before the release published an arm64 asset. Re-run setup-windows-with-uac.ps1 as an administrator to replace it, and the ARM64 ssh.exe beside it, with the native build.' } $vs = $null @@ -573,7 +615,11 @@ function Invoke-ArchAudit { $targets = [ordered]@{ 'git.exe' = @("$env:LOCALAPPDATA\Programs\Git\cmd\git.exe", (Join-Path $env:ProgramFiles 'Git\cmd\git.exe')) 'python.exe' = @() - 'py.exe' = @("$env:WINDIR\py.exe") + # Both homes of the launcher: C:\Windows for an all-users install, the + # per-user Launcher directory otherwise. Often neither - it is a separate + # component from the interpreter, and "- not installed" here next to a + # native python.exe is the normal result of an unelevated Python install. + 'py.exe' = @("$env:WINDIR\py.exe", "$env:LOCALAPPDATA\Programs\Python\Launcher\py.exe") 'pwsh.exe' = @() 'cmake.exe' = @((Join-Path $env:ProgramFiles 'CMake\bin\cmake.exe')) 'ninja.exe' = @() @@ -589,7 +635,18 @@ function Invoke-ArchAudit { 'BinSkim.exe' = @((Join-Path $BinSkimDir 'BinSkim.exe')) 'rsync.exe' = @((Join-Path $RsyncDir 'rsync.exe')) 'ssh.exe' = @((Join-Path $env:WINDIR 'System32\OpenSSH\ssh.exe')) - 'nasm.exe' = @() + # NASM's installer falls back to a per-user directory when it cannot + # write to Program Files - see the NASM comment in setup-windows.bat. It + # registers nothing there, so winget cannot see it (and re-downloads and + # re-runs the installer on every run), and it puts nothing on the PATH. + # Without these candidates the audit reported "- not installed" for a + # nasm.exe that was on disk all along, and then still concluded that + # everything had resolved. + 'nasm.exe' = @( + (Join-Path $env:LOCALAPPDATA 'bin\NASM\nasm.exe') + (Join-Path $env:ProgramFiles 'NASM\nasm.exe') + (Join-Path ${env:ProgramFiles(x86)} 'NASM\nasm.exe') + ) 'iperf3.exe' = @() 'OpenCppCoverage.exe' = @((Join-Path $env:ProgramFiles 'OpenCppCoverage\OpenCppCoverage.exe'), (Join-Path ${env:ProgramFiles(x86)} 'OpenCppCoverage\OpenCppCoverage.exe')) 'vswhere.exe' = @($vsWhereExe) @@ -608,6 +665,21 @@ function Invoke-ArchAudit { $targets['clang-cl.exe (VS)'] = @((Join-Path $vs "VC\Tools\Llvm\$llvmHost\clang-cl.exe")) } + # Tools this box does not provision on ARM64. Dropped from the audit rather + # than left to print "- not installed", because that line reads as a gap in + # the provisioning when it is the provisioning working as intended - and a + # dull audit is one you keep reading. + # + # The rows survive on x64, where all of these are installed and expected. + # Anything still on disk from before the split shows up in the winget list, + # not here. + if ($IsArm64) { + foreach ($gone in 'WinMergeU.exe', 'BinSkim.exe', 'nasm.exe', + 'OpenCppCoverage.exe', 'clang-cl.exe', 'clang-cl.exe (VS)') { + $targets.Remove($gone) + } + } + $native = if ($IsArm64) { 'ARM64' } else { 'x64' } $unexpected = @() foreach ($name in $targets.Keys) { @@ -679,6 +751,10 @@ foreach ($name in $steps.Keys) { Write-Host "`n==> $name (skipped)" -ForegroundColor DarkGray continue } + if ($IsArm64 -and $Arm64Dropped.Contains($name)) { + Write-Host "`n==> $name (skipped: $($Arm64Dropped[$name]))" -ForegroundColor DarkGray + continue + } try { & $steps[$name] } catch {