X-Git-Url: https://vilimpoc.org/repos/dotfiles/blobdiff_plain/4658d6ddc8aaaa7e6b52fe3939151d3b35ddacab..325b494c6241dcc4dc1cb7436ee84ac105b318eb:/setup-windows-no-uac.ps1 diff --git a/setup-windows-no-uac.ps1 b/setup-windows-no-uac.ps1 index 2a104fb..0e9c7d4 100644 --- a/setup-windows-no-uac.ps1 +++ b/setup-windows-no-uac.ps1 @@ -11,6 +11,8 @@ elevated would configure the *administrator's* profile instead of yours. What this installs / configures: + - %USERPROFILE%\.local\bin on the user PATH: where Claude Code's native + installer puts claude.exe, and nothing else guarantees it is on the 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 @@ -21,25 +23,39 @@ - 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 + - Rust's stable MSVC toolchain for this host - x86_64 on x64, aarch64 on + ARM64 - installed through rustup and made the default + - The Android SDK, per-user in %LOCALAPPDATA%\Android\Sdk (x64 only): the + command-line tools, platform-tools and the newest stable platform and + build-tools, SDK licences accepted, ANDROID_HOME set - and JAVA_HOME, to + Android Studio's bundled JDK, when there is none - An architecture audit: the real PE machine type of every tool this box provisions, resolved the way a shell would. Informational, never fatal. Anything running emulated without a listed reason is called out. FILL IN $GitUserName / $GitUserEmail below before the first run. + The steps are the 'user' rows of setup-windows-steps.ps1. The batch file runs + this with -Only -Yes, having already asked. + Run by hand, it lists what it will do and asks before doing any of it; -Only + and -Skip pick steps, and -Yes skips the question. + Steps are independent: one failing warns and the rest still run. The exit code - is 1 if any step failed, 0 otherwise. + is 1 if any step failed, 2 if there was no console to ask on (re-run with + -Yes), 0 otherwise. #> [CmdletBinding()] param( - # Skip individual steps. Note that `powershell -File` cannot pass more than - # one value to an array parameter (neither comma- nor space-separated), so - # for several, dot-call the script or use -Command: + # Steps to take (-Only) or leave out (-Skip), by the names the plan shows. + # For several, separate them with commas. `powershell -File` hands "A,B" to + # an array parameter as ONE string, so it is split here and either way works: # .\setup-windows-no-uac.ps1 -Skip BinSkim,GitConfig - # powershell -File .\setup-windows-no-uac.ps1 -Skip BinSkim - [ValidateSet('WinMerge', 'VsWhere', 'BinSkim', 'GitConfig', 'NinjaPath', 'LlvmPath', 'ArchAudit')] - [string[]] $Skip = @() + # powershell -File .\setup-windows-no-uac.ps1 -Skip BinSkim,GitConfig + [string[]] $Only, + [string[]] $Skip = @(), + # Do not ask first. setup-windows.bat passes it, having asked already. + [switch] $Yes ) $ErrorActionPreference = 'Stop' @@ -59,21 +75,18 @@ if (-not $rawArch) { $rawArch = [Runtime.InteropServices.RuntimeInformation]::OS $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. +# Steps that do not run on ARM64 - WinMergePath, BinSkim and LlvmPath - are +# marked -X64Only, with the reason, in setup-windows-steps.ps1. The plan printed +# before anything runs shows each of them with that reason. # -# 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. +# The ARM64 machine is provisioned as a single-compiler build box, 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' -} +# -Only and -Skip work on top of this; they can only subtract. +. (Join-Path $PSScriptRoot 'setup-windows-steps.ps1') # --- Global git identity: FILL THESE IN BEFORE RUNNING --- # Left empty, Set-GlobalGitConfig skips the identity and says so, rather than @@ -92,6 +105,24 @@ $BinSkimDir = Join-Path $env:LOCALAPPDATA 'Programs\BinSkim' # setup-windows-with-uac.ps1 if you move the install. $RsyncDir = 'C:\Tools\rsync' +# Where rustup keeps itself (.cargo) and its toolchains (.rustup): rustup-init's +# own defaults, unless CARGO_HOME / RUSTUP_HOME say otherwise. The host triple is +# the one Rust toolchain this box is set up with - see Set-RustDefaultToolchain. +$CargoHome = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { Join-Path $env:USERPROFILE '.cargo' } +$RustupHome = if ($env:RUSTUP_HOME) { $env:RUSTUP_HOME } else { Join-Path $env:USERPROFILE '.rustup' } +$RustHost = switch ($HostArch) { + 'Arm64' { 'aarch64-pc-windows-msvc' } + 'X64' { 'x86_64-pc-windows-msvc' } + default { $null } +} + +# The Android SDK: where Android Studio puts it by default, unless ANDROID_HOME +# already names one. "Latest" is read from Google's package index at run time, +# the same index sdkmanager and Android Studio's SDK Manager read. +$AndroidSdkRoot = if ($env:ANDROID_HOME) { $env:ANDROID_HOME } else { Join-Path $env:LOCALAPPDATA 'Android\Sdk' } +$AndroidRepo = 'https://dl.google.com/android/repository/' +$AndroidIndex = $AndroidRepo + 'repository2-3.xml' + function Write-Step([string]$Msg) { Write-Host "`n==> $Msg" -ForegroundColor Cyan } @@ -138,6 +169,22 @@ function Add-ToUserPath { } } +function Add-LocalBinToUserPath { + # %USERPROFILE%\.local\bin is where Claude Code's native installer puts + # claude.exe (see setup-windows.bat). The installer only prints a reminder + # when the directory is not on the PATH, and it is the per-user bin + # directory other tools reach for too, so put it there regardless and create + # it if it is missing - an entry for a directory that is not there yet would + # only be dead until something fills it. + Write-Step '%USERPROFILE%\.local\bin on the user PATH' + $dir = Join-Path $env:USERPROFILE '.local\bin' + if (-not (Test-Path $dir)) { + New-Item -ItemType Directory -Path $dir | Out-Null + Write-Host " Created $dir." + } + Add-ToUserPath $dir +} + function Add-WinMergeToUserPath { Write-Step 'WinMerge on the user PATH' $candidates = @( @@ -203,6 +250,10 @@ function Install-BinSkim { # newest at the moment of the request. Write-Step 'BinSkim' [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + # No progress bar: Windows PowerShell 5.1 redraws it per chunk, and on a + # download this size that, not the network, is the wait - see + # Install-AndroidSdk for the measurement. Local to this function. + $ProgressPreference = 'SilentlyContinue' $exe = Join-Path $BinSkimDir 'BinSkim.exe' $marker = Join-Path $BinSkimDir 'nupkg-version.txt' @@ -373,7 +424,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" } @@ -489,6 +550,333 @@ function Add-LlvmToUserPath { Add-ToUserPath $dir } +function Get-RustupPath { + # winget installed rustup moments ago, but this process inherited its PATH + # before rustup-init added .cargo\bin to it, so Get-Command can miss it on a + # first run. Prefer one already on the PATH, then the cargo home. + $onPath = Get-Command rustup.exe -ErrorAction SilentlyContinue + if ($onPath) { return $onPath.Source } + $exe = Join-Path $CargoHome 'bin\rustup.exe' + if (Test-Path $exe) { return $exe } + $null +} + +function Set-RustDefaultToolchain { + # Install Rust's stable MSVC toolchain for THIS host and make it the default: + # stable-x86_64-pc-windows-msvc on x64, stable-aarch64-pc-windows-msvc on + # ARM64. + # + # winget's rustup install mostly does this already - it runs + # `rustup-init -y -q`, which installs stable for the host rustup detects - so + # on a fresh box this step largely confirms it. It exists to make the answer + # explicit rather than inherited. rustup takes its default host from its own + # build, so an x64 rustup on an ARM64 box - an install from before the + # manifest had an arm64 rustup-init, or one started from an emulated x64 + # shell - quietly sets up an x86_64 host and an emulated compiler. Naming the + # triple pins both the toolchain installed here and, through + # `set default-host`, what a bare `stable` means to rustup from then on. + # + # MSVC rather than GNU: the -msvc toolchains link with link.exe and the + # Windows SDK from the Visual Studio the elevated half installs - including + # the ARM64 build tools an aarch64 host links with. Those are needed to BUILD, + # not to install, so this step does not depend on the elevated half. + # + # Re-runs are cheap: `toolchain install` on an installed toolchain updates it + # to the current stable, or reports it unchanged. Setting the default each + # time is the point of the step - a default you changed by hand (to nightly, + # say) is put back to stable, so leave the step out of the plan to keep it. + Write-Step 'Rust: stable MSVC toolchain as the default' + if (-not $RustHost) { + Write-Warning "No Rust host toolchain is set up for host architecture '$HostArch'; skipping." + return + } + $rustup = Get-RustupPath + if (-not $rustup) { + Write-Warning 'rustup not found. Install it with: winget install Rustlang.Rustup' + return + } + Write-Host " using $rustup ($(Get-PEMachine $rustup))" + + # EAP back to Continue for the calls: rustup reports progress on STDERR, and + # under $ErrorActionPreference = 'Stop' a native command's stderr can become + # a terminating error. Judged by the exit code instead - cleared first, as + # for ssh.exe above, so an exe that cannot start at all does not inherit the + # last one's 0. + $toolchain = "stable-$RustHost" + $calls = @( + @('set', 'default-host', $RustHost), + @('toolchain', 'install', $toolchain), + @('default', $toolchain) + ) + $prevEap = $ErrorActionPreference + $ErrorActionPreference = 'Continue' + try { + foreach ($call in $calls) { + $global:LASTEXITCODE = $null + & $rustup @call + if ($LASTEXITCODE -ne 0) { + $why = if ($null -eq $LASTEXITCODE) { 'it would not start' } else { "exit $LASTEXITCODE" } + throw "rustup $($call -join ' ') failed ($why)" + } + } + } finally { + $ErrorActionPreference = $prevEap + } + + # Report the compiler itself. .cargo\bin\rustc.exe is a rustup proxy - a copy + # of rustup.exe - so its architecture says nothing about the toolchain's. + $rustc = Join-Path $RustupHome "toolchains\$toolchain\bin\rustc.exe" + if (Test-Path $rustc) { + Write-Host " default: $toolchain - $(& $rustc -V) ($(Get-PEMachine $rustc))" + } else { + Write-Warning "rustup reported success, but $rustc is not there." + } + + # An x86_64 host toolchain left on an ARM64 box - from before this step + # pinned the triple - is an emulated compiler that is no longer the default. + # Named rather than removed; whether it goes is your call. Building x64 code + # from here wants the x64 TARGET on the native toolchain, not an x64 host. + $x64Stable = Join-Path $RustupHome 'toolchains\stable-x86_64-pc-windows-msvc' + if ($IsArm64 -and (Test-Path $x64Stable)) { + Write-Host ' Also installed: stable-x86_64-pc-windows-msvc, an x64 compiler that runs emulated here.' -ForegroundColor Yellow + Write-Host " Remove it with 'rustup toolchain uninstall stable-x86_64-pc-windows-msvc'; to build" -ForegroundColor Yellow + Write-Host " x64 code from this box, use 'rustup target add x86_64-pc-windows-msvc' instead." -ForegroundColor Yellow + } +} + +function Set-UserEnvironmentVariable([string] $Name, [string] $Value) { + # HKCU, like Add-ToUserPath, so it outlives the script; written only when it + # differs, so a re-run changes nothing. + if ([Environment]::GetEnvironmentVariable($Name, 'User') -eq $Value) { + Write-Host " $Name is already $Value" + return + } + [Environment]::SetEnvironmentVariable($Name, $Value, 'User') + Write-Host " Set $Name = $Value (restart your shell to pick it up)." +} + +function Get-AndroidRevision($Package) { + # A package's revision from the index, as a [version]: , optional + # and . [int] of a missing element is 0. + $r = $Package.revision + [version]('{0}.{1}.{2}' -f [int]$r.major, [int]$r.minor, [int]$r.micro) +} + +function ConvertTo-Revision([string] $Text) { + # "23.0" as the same three-part [version] the index gives, so the two + # compare. [version]'23.0' has no third part - it reads as -1 - and so + # counted as OLDER than 23.0.0: an installed, current copy looked stale. + $parts = @($Text.Trim() -split '\.' | Where-Object { $_ -ne '' }) + while ($parts.Count -lt 3) { $parts += '0' } + [version]($parts[0..2] -join '.') +} + +function Invoke-AndroidCli { + # The Android CLI (cmdline-tools\latest\bin\android.exe) against this SDK, + # its output shown as it comes - a first install downloads well over 100 MB + # and should not look stalled. Returns the exit code, $null if it would not + # start. EAP Continue for the call, as for the other native tools here. + # + # stdin is one empty line, so it is closed rather than the console: a + # prompt nobody expected gets "no" instead of an unattended run waiting on + # it forever. + param([string[]] $Arguments) + $cli = Join-Path $AndroidSdkRoot 'cmdline-tools\latest\bin\android.exe' + $prevEap = $ErrorActionPreference + $ErrorActionPreference = 'Continue' + try { + $global:LASTEXITCODE = $null + # Its stderr becomes error records under 2>&1 in Windows PowerShell, + # which would print as red "NativeCommandError" noise; back to plain + # lines first. The one JVM warning dropped is the bundled Java noting, + # on every call, a flag this Windows 10 does not support. + '' | & $cli "--sdk=$AndroidSdkRoot" @Arguments 2>&1 | ForEach-Object { "$_" } | + Where-Object { $_ -notmatch 'UseAllWindowsProcessorGroups flag is not supported' } | Out-Host + $LASTEXITCODE + } finally { + $ErrorActionPreference = $prevEap + } +} + +function Install-AndroidSdk { + # The Android SDK for building apps, per-user, in Android Studio's default + # location (%LOCALAPPDATA%\Android\Sdk) unless ANDROID_HOME names another: + # the command-line tools, platform-tools, and the newest stable platform and + # build-tools. That is what Android Studio's first-run wizard would set up, + # done without the wizard - on the x64 laptop Studio was installed and that + # wizard had never run, so there was no SDK at all. Gradle fetches any other + # platform or build-tools a project asks for by itself, once the licences are + # accepted, so this is the floor rather than the whole set. + # + # "Newest stable" comes from Google's package index, read here each run: + # channel-0 (stable) and no revision, the platform by API level + # (android-37.2 beats android-37.1 beats android-36), build-tools by version. + # + # THE COMMAND-LINE TOOLS ARE NOT WHAT THEY WERE. From 23.0, sdkmanager is + # deprecated and sdkmanager.bat is a shim over the new Android CLI + # (cmdline-tools\latest\bin\android.exe, `android sdk install ...`), which on + # first use installs itself into %USERPROFILE%\.android (bin\android-cli.exe, + # about 90 MB, and cli\ - a bundled Java runtime, and a metrics spool). So + # the CLI is called directly here, with its own "platforms/android-37.2" + # package paths: no deprecated shim, and no cmd parsing to split the old + # "platforms;android-37.2" at its semicolon. `sdk install` installs a + # package or, if it is there, updates it to the latest - so it is also the + # re-run path, downloading nothing when everything is current. + # + # ITS EXIT CODE IS NOT TRUSTED. CLI 1.0.16406183 finishes every `sdk` + # command and then crashes on the way out, 0xC0000409 (a fail-fast in + # ucrtbase) - on the x64 laptop's Windows 10, every time, in a console or + # not, while `--version` and `info` exit 0. So success is judged by the + # result: each package asked for must have the package.xml the CLI writes + # once a package is complete. A nonzero exit with everything present is a + # note, not a failure; anything missing is a failure, whatever the exit. + # + # The command-line tools themselves are bootstrapped from the index's own + # "cmdline-tools;latest" archive (SHA-1 from the index), and replaced only + # when the index has a newer revision than the one in source.properties. + # The CLI cannot do that for them: the archive calls itself + # cmdline-tools;23.0, a fixed version, so it would never "update" it. + # + # The SDK licences are accepted on your behalf; the plan says so before + # anything runs. The CLI does it as it installs - sdkmanager --licenses is + # now a no-op - writing licenses\android-sdk-license. Gradle needs it to + # build, and to fetch what a project asks for. + # + # The CLI brings its own Java, so the SDK needs no JDK. Gradle does: when + # there is no JAVA_HOME, the one Android Studio bundles (jbr) becomes the + # user's, so a command-line gradlew works. An existing JAVA_HOME is never + # changed. + Write-Step "Android SDK in $AndroidSdkRoot" + + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + # No progress bar for the downloads. Windows PowerShell 5.1's + # Invoke-WebRequest redraws it per chunk, and that - not the network - is + # what a large download then waits on: measured on the x64 laptop, the + # 148 MB command-line tools took about ten minutes and five minutes of CPU + # with it on. Local to this function, so nothing else changes. + $ProgressPreference = 'SilentlyContinue' + [xml]$index = (Invoke-WebRequest -UseBasicParsing -Uri $AndroidIndex).Content + $stable = @($index.DocumentElement.remotePackage | + Where-Object { $_.channelRef.ref -eq 'channel-0' -and -not $_.revision.preview }) + + # --- the command-line tools: bootstrapped, and kept current, from the index --- + $ct = @($stable | Where-Object { $_.path -eq 'cmdline-tools;latest' })[0] + if (-not $ct) { throw "No stable cmdline-tools;latest in $AndroidIndex." } + $ctWant = Get-AndroidRevision $ct + $ctDir = Join-Path $AndroidSdkRoot 'cmdline-tools\latest' + $ctHave = $null + $props = Join-Path $ctDir 'source.properties' + if (Test-Path $props) { + $m = [regex]::Match((Get-Content $props -Raw), '(?m)^Pkg\.Revision=(\d+(\.\d+){0,2})') + if ($m.Success) { $ctHave = ConvertTo-Revision $m.Groups[1].Value } + } + if ($ctHave -and $ctHave -ge $ctWant) { + Write-Host " command-line tools $ctHave are current." + } else { + $archive = @($ct.archives.archive | Where-Object { $_.'host-os' -eq 'windows' })[0] + $sum = $archive.complete.checksum + $sha1 = if ($sum -is [string]) { $sum } else { $sum.'#text' } + $url = $AndroidRepo + $archive.complete.url + Write-Host " command-line tools $(if ($ctHave) { "$ctHave -> " })$ctWant; downloading $($archive.complete.url)." + # PATH LENGTH. The archive nests deep - a guava jar in it sits well over + # 150 characters below its top - and Windows PowerShell 5.1 is bound by + # the 260-character MAX_PATH. So the temp directory's name is 8 + # characters: %TEMP%\xxxxxxxx\cmdline-tools\... is then no deeper than + # %LOCALAPPDATA%\Android\Sdk\cmdline-tools\latest\..., and whenever the + # SDK's own path fits, unpacking it does too. (A 43-character name here + # made the unpack deeper than the SDK it was for.) + $tmp = Join-Path $env:TEMP ([guid]::NewGuid().ToString('N').Substring(0, 8)) + New-Item -ItemType Directory -Force -Path $tmp | Out-Null + try { + $zip = Join-Path $tmp 'ct.zip' + Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $zip + $got = (Get-FileHash $zip -Algorithm SHA1).Hash.ToLower() + if ($sha1 -and $got -ne $sha1.ToLower()) { throw "SHA-1 mismatch for $url`: expected $sha1, got $got" } + Expand-Archive -Path $zip -DestinationPath $tmp -Force + # The archive holds a top-level cmdline-tools\ directory; the SDK + # layout wants it at cmdline-tools\latest. Replaced wholesale, as + # BinSkim is, so files dropped between releases do not linger - but + # the old copy is RENAMED aside first and deleted last. A rename is + # one operation whatever the depth below it; deleting walks every + # file and can trip over a path that is too long. Done this way, a + # delete that fails leaves a stray folder to report, not an SDK + # with no command-line tools in it. The aside name is six + # characters, like "latest", so the delete is no deeper either. + New-Item -ItemType Directory -Force -Path (Split-Path $ctDir) | Out-Null + $old = $null + if (Test-Path $ctDir) { + $old = Join-Path (Split-Path $ctDir) ('old' + [guid]::NewGuid().ToString('N').Substring(0, 3)) + Rename-Item -Path $ctDir -NewName (Split-Path $old -Leaf) + } + Move-Item -Path (Join-Path $tmp 'cmdline-tools') -Destination $ctDir + if ($old) { + try { Remove-Item -Recurse -Force $old } + catch { Write-Warning "The new command-line tools are in place, but the old copy could not be removed: $old ($($_.Exception.Message))" } + } + } finally { + Remove-Item -Recurse -Force $tmp -ErrorAction SilentlyContinue + } + } + + # --- the newest stable platform and build-tools, by the index --- + $platform = @($stable | ForEach-Object { + $m = [regex]::Match($_.path, '^platforms;android-(\d+)(?:\.(\d+))?$') + if ($m.Success) { + [pscustomobject]@{ Path = $_.path; Api = [version]('{0}.{1}' -f $m.Groups[1].Value, [int]$m.Groups[2].Value) } + } + } | Sort-Object Api)[-1].Path + $buildTools = @($stable | Where-Object { $_.path -match '^build-tools;\d+(\.\d+)*$' } | + Sort-Object { [version]($_.path -replace '^build-tools;', '') })[-1].path + if (-not $platform -or -not $buildTools) { throw "Could not find a stable platform and build-tools in $AndroidIndex." } + + # The index names packages "platforms;android-37.2"; the CLI, and the SDK's + # directories, use "platforms/android-37.2". + $packages = @('platform-tools', ($platform -replace ';', '/'), ($buildTools -replace ';', '/')) + Write-Host " installing or updating: $($packages -join ', ')" + $rc = Invoke-AndroidCli -Arguments (@('sdk', 'install') + $packages) + $missing = @($packages | Where-Object { -not (Test-Path (Join-Path $AndroidSdkRoot (($_ -replace '/', '\') + '\package.xml'))) }) + if ($missing) { + $why = if ($null -eq $rc) { 'it would not start' } else { "exit $rc" } + throw "android sdk install left out $($missing -join ', ') ($why)" + } + if ($null -eq $rc) { + Write-Warning 'The Android CLI would not start; the packages already installed were left as they were, not updated.' + } elseif ($rc -ne 0) { + Write-Host (" note: the Android CLI exited {0} (0x{0:X8}) after finishing - its crash on the way out, not a failed" -f $rc) -ForegroundColor DarkGray + Write-Host ' install: every package asked for is in place.' -ForegroundColor DarkGray + } + + # Report what is there now, from each package's own source.properties. + foreach ($pkg in $packages) { + $p = Join-Path $AndroidSdkRoot (($pkg -replace '/', '\') + '\source.properties') + $rev = if (Test-Path $p) { [regex]::Match((Get-Content $p -Raw), '(?m)^Pkg\.Revision=(.*)$').Groups[1].Value.Trim() } else { '?' } + Write-Host (' {0,-28} {1}' -f $pkg, $rev) + } + + Set-UserEnvironmentVariable 'ANDROID_HOME' $AndroidSdkRoot + + # JAVA_HOME, for Gradle - only when there is none, and only to Android + # Studio's bundled JDK. Without Studio this just says what is missing. + if (-not [Environment]::GetEnvironmentVariable('JAVA_HOME', 'User') -and + -not [Environment]::GetEnvironmentVariable('JAVA_HOME', 'Machine')) { + $jbr = @((Join-Path $env:ProgramFiles 'Android\Android Studio\jbr'), + (Join-Path $env:LOCALAPPDATA 'Programs\Android Studio\jbr') | + Where-Object { Test-Path (Join-Path $_ 'bin\java.exe') })[0] + if ($jbr) { + Set-UserEnvironmentVariable 'JAVA_HOME' $jbr + } else { + Write-Warning 'No JAVA_HOME, and no Android Studio JDK to point it at: a command-line gradlew will need one. Install Android Studio (the AndroidStudio step) or a JDK.' + } + } + + # The Android CLI (android), and the tools beside it (lint, d8, r8, + # apkanalyzer, the sdkmanager/avdmanager shims), in any shell. + # platform-tools is NOT added: the PlatformTools step already puts adb on the + # PATH, and two adb.exe on it would only make which one answers depend on + # the order. + Add-ToUserPath (Join-Path $ctDir 'bin') +} + function Get-PEMachine { # Architecture of a PE, read straight from the COFF header: the 2 bytes at # the e_lfanew offset + 4. Cheap, and it answers the only question that @@ -574,6 +962,7 @@ function Invoke-ArchAudit { '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' + 'adb.exe' = 'Google ships platform-tools as x86 only; bound by the USB/TCP link' } # Fixable cases: a native build DOES exist, something just resolved ahead of @@ -585,14 +974,16 @@ function Invoke-ArchAudit { # 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 + # All of these 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).' '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.' + 'claude.exe' = 'Not the build for this host. Re-run setup-windows.bat -Only ClaudeCode, which installs the right one. If the path above is under WinGet, it is the old winget copy: winget uninstall Anthropic.ClaudeCode.' + 'rustc.exe' = 'Only the x64 host toolchain is installed. Run .\setup-windows-no-uac.ps1 -Only RustToolchain: it installs stable for this host and makes it the default.' } $vs = $null @@ -603,7 +994,10 @@ function Invoke-ArchAudit { # name -> extra candidate paths searched when the name is not on the PATH. $targets = [ordered]@{ - 'git.exe' = @("$env:LOCALAPPDATA\Programs\Git\cmd\git.exe", (Join-Path $env:ProgramFiles 'Git\cmd\git.exe')) + # The native installer's launcher, then the old winget route's link. + # PATH-first like the rest, so this reports whichever claude wins. + 'claude.exe' = @((Join-Path $env:USERPROFILE '.local\bin\claude.exe'), (Join-Path $env:LOCALAPPDATA 'Microsoft\WinGet\Links\claude.exe')) + 'git.exe' =@("$env:LOCALAPPDATA\Programs\Git\cmd\git.exe", (Join-Path $env:ProgramFiles 'Git\cmd\git.exe')) 'python.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 @@ -620,6 +1014,17 @@ function Invoke-ArchAudit { (Join-Path $env:LOCALAPPDATA 'Programs\LLVM\bin\clang-cl.exe') (Join-Path ([Environment]::GetFolderPath('MyDocuments')) 'LLVM\bin\clang-cl.exe') ) + # rustup itself, then the compiler the stable toolchain really runs. The + # rustc.exe in .cargo\bin that a shell would find is a rustup proxy - a + # copy of rustup.exe - so its architecture is rustup's, not the + # toolchain's. The labelled row looks inside the toolchain instead, + # native host first, so an x64 toolchain on ARM64 only shows up when it + # is the one there is. + 'rustup.exe' = @((Join-Path $CargoHome 'bin\rustup.exe')) + 'rustc.exe (stable)' = @( + $(if ($RustHost) { Join-Path $RustupHome "toolchains\stable-$RustHost\bin\rustc.exe" }) + (Join-Path $RustupHome 'toolchains\stable-x86_64-pc-windows-msvc\bin\rustc.exe') + ) 'dotnet.exe' = @((Join-Path $env:ProgramFiles 'dotnet\dotnet.exe')) 'WinMergeU.exe' = @((Join-Path $env:ProgramFiles 'WinMerge\WinMergeU.exe'), (Join-Path ${env:ProgramFiles(x86)} 'WinMerge\WinMergeU.exe')) 'BinSkim.exe' = @((Join-Path $BinSkimDir 'BinSkim.exe')) @@ -638,6 +1043,11 @@ function Invoke-ArchAudit { (Join-Path ${env:ProgramFiles(x86)} 'NASM\nasm.exe') ) 'iperf3.exe' = @() + # A winget portable package: unpacked under WinGet\Packages, with that + # directory put on the user PATH. This finds it should the PATH entry + # have gone missing. + 'adb.exe' = @(Resolve-Path (Join-Path $env:LOCALAPPDATA 'Microsoft\WinGet\Packages\Google.PlatformTools_*\platform-tools\adb.exe') -ErrorAction SilentlyContinue | + ForEach-Object { $_.Path }) 'OpenCppCoverage.exe' = @((Join-Path $env:ProgramFiles 'OpenCppCoverage\OpenCppCoverage.exe'), (Join-Path ${env:ProgramFiles(x86)} 'OpenCppCoverage\OpenCppCoverage.exe')) 'vswhere.exe' = @($vsWhereExe) 'xperf.exe' = @((Join-Path ${env:ProgramFiles(x86)} 'Windows Kits\10\Windows Performance Toolkit\xperf.exe')) @@ -723,34 +1133,64 @@ if (([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:: Write-Warning 'Running elevated. The user PATH and .gitconfig changes below will apply to the administrator profile, not yours.' } -$steps = [ordered]@{ - WinMerge = { Add-WinMergeToUserPath } - VsWhere = { Add-VsWhereToUserPath } - BinSkim = { Install-BinSkim } - GitConfig = { Set-GlobalGitConfig } - NinjaPath = { Set-NativeNinjaFirst } - LlvmPath = { Add-LlvmToUserPath } - # Last on purpose: it reports on what the steps above (and the winget installs - # in setup-windows.bat) actually put on the box. - ArchAudit = { Invoke-ArchAudit } +# What each step runs. The ORDER comes from setup-windows-steps.ps1, which lists +# ArchAudit last on purpose: it reports on what the steps before it (and the +# winget installs in setup-windows.bat) actually put on the box. +$steps = @{ + LocalBinPath = { Add-LocalBinToUserPath } + WinMergePath = { Add-WinMergeToUserPath } + VsWhere = { Add-VsWhereToUserPath } + BinSkim = { Install-BinSkim } + GitConfig = { Set-GlobalGitConfig } + NinjaPath = { Set-NativeNinjaFirst } + LlvmPath = { Add-LlvmToUserPath } + RustToolchain = { Set-RustDefaultToolchain } + AndroidSdk = { Install-AndroidSdk } + ArchAudit = { Invoke-ArchAudit } } +# The catalog and the table above have to agree exactly. A catalog row with no +# code here would be shown in the plan and then never taken; an entry here with +# no row would never be shown, so never selected. Either is a bug in these +# scripts, not in the box, so it stops the run before anything happens. +$catalog = @(Get-SetupCatalog -IsArm64 $IsArm64 | Where-Object Runner -eq 'user') +$unbacked = @($catalog | Where-Object { -not $steps.ContainsKey($_.Id) } | ForEach-Object { $_.Id }) +$unlisted = @($steps.Keys | Where-Object { @($catalog.Id) -notcontains $_ }) +if ($unbacked -or $unlisted) { + $diff = @() + if ($unbacked) { $diff += "in the catalog but not here: $($unbacked -join ', ')" } + if ($unlisted) { $diff += "here but not in the catalog: $($unlisted -join ', ')" } + throw "setup-windows-steps.ps1 and this script disagree - $($diff -join '; ')." +} + +# 'WinMerge' was this step's name until the catalog put it beside the winget +# step of the same name; still accepted. +$plan = @(Resolve-SetupSelection -Steps $catalog ` + -Only $(if ($PSBoundParameters.ContainsKey('Only')) { $Only } else { $null }) -Skip $Skip ` + -Aliases @{ WinMerge = 'WinMergePath' } -IsArm64 $IsArm64 ` + -VirtualMachine (Get-SetupVirtualMachine)) +Write-SetupPlan $plan 'Plan for setup-windows-no-uac.ps1' +$runCount = @($plan | Where-Object Selected).Count +if ($runCount -eq 0) { + Write-Host ' Nothing selected, so there is nothing to do.' + exit 0 +} +$ok = Confirm-SetupPlan -Yes:$Yes -Count $runCount +if ($ok -ne $true) { exit $(if ($null -eq $ok) { 2 } else { 0 }) } + $failed = @() -foreach ($name in $steps.Keys) { - if ($Skip -contains $name) { - Write-Host "`n==> $name (skipped)" -ForegroundColor DarkGray - continue - } - if ($IsArm64 -and $Arm64Dropped.Contains($name)) { - Write-Host "`n==> $name (skipped: $($Arm64Dropped[$name]))" -ForegroundColor DarkGray +foreach ($p in $plan) { + if (-not $p.Selected) { + # Only the skips with a reason; the plan above already listed the rest. + if ($p.Why) { Write-Host "`n==> $($p.Id) (skipped: $($p.Why))" -ForegroundColor DarkGray } continue } try { - & $steps[$name] + & $steps[$p.Id] } catch { # One broken step must not cost the others. Collect and report at the end. - Write-Warning "$name failed: $($_.Exception.Message)" - $failed += $name + Write-Warning "$($p.Id) failed: $($_.Exception.Message)" + $failed += $p.Id } }