{WARNING} I'm in the process of upgrading the compiler and getting rid of choco in these scripts. The following changes are ENTIRELY UNTEST in my test VM.

master
Zed A. Shaw 4 weeks ago
parent e93dc46116
commit 8ef1b1fe2b
  1. 15
      base.ps1
  2. 3
      cpp.ps1
  3. 1
      extras.ps1

@ -248,17 +248,15 @@ if(-not $isAdmin) {
} }
$installs=@( $installs=@(
'chocolatey', 'Geany.Geany',
'Git.Git', 'Git.Git',
'Genivia.ugrep', 'Genivia.ugrep',
'Microsoft.WindowsTerminal', 'Microsoft.WindowsTerminal',
'AntibodySoftware.WizFile',
'Kitware.CMake', 'Kitware.CMake',
'Microsoft.VCRedist.2015+.x64',
'Microsoft.VCRedist.2015+.x64' 'Microsoft.VCRedist.2015+.x64'
) )
$choco_installs=@('geany','geany-plugins','winlibs') $choco_installs=@()
Write-Warning "About to install the following software:" Write-Warning "About to install the following software:"
Write-Warning "-----------------------------------------" Write-Warning "-----------------------------------------"
@ -273,6 +271,13 @@ foreach($pkg in $installs) {
Start-Process -NoNewWindow -Wait winget -ArgumentList 'install',$pkg Start-Process -NoNewWindow -Wait winget -ArgumentList 'install',$pkg
} }
Start-Process -Verb RunAs -Wait powershell -argumentlist 'C:\ProgramData\chocolatey\bin\choco.exe','install','geany','geany-plugins','winlibs' Write-Warning "!! Installing WinLibs in $env:HOMEPATH\WinLibs"
Write-Warning "This has to be installed this way because winget won't add it to the path so I have to do it manually. If you don't want this, then hit CTRL-C and install WinLibs yourself."
Read-Host -Prompt "Press any key to continue, or CTRL-C to abort" | Out-Null
winget install --location "$env:HOMEPATH\WinLibs" -e BrechtSanders.WinLibs.POSIX.UCRT.LLVM
$newPath = $Env:PATH + ";$env:HOMEPATH\WinLibs\mingw64\bin"
[Environment]::SetEnvironmentVariable("Path", $newPath, "User")
Write-Warning "!!! CLOSE THIS POWERSHELL AND START A NEW ONE TO UPDATE PATH!" Write-Warning "!!! CLOSE THIS POWERSHELL AND START A NEW ONE TO UPDATE PATH!"

@ -113,5 +113,6 @@ function ConfirmBaseRun {
ConfirmBaseRun ConfirmBaseRun
Start-Process -NoNewWindow -Wait winget -ArgumentList 'install','ezwinports.make' Start-Process -NoNewWindow -Wait winget -ArgumentList 'install','ezwinports.make'
Start-Process -NoNewWindow -Wait winget -ArgumentList 'install','mesonbuild.meson'
Start-Process -NoNewWindow -Wait winget -ArgumentList 'install','Kitware.CMake'
Start-Process -Verb RunAs -Wait powershell -argumentlist 'C:\ProgramData\chocolatey\bin\choco.exe','install','winlibs','conan','meson'

@ -113,6 +113,7 @@ function ConfirmBaseRun {
ConfirmBaseRun ConfirmBaseRun
$extras=@( $extras=@(
'AntibodySoftware.WizFile',
'GnuWin32.Which', 'GnuWin32.Which',
'GNU.Wget2', 'GNU.Wget2',
'GNU.Nano', 'GNU.Nano',

Loading…
Cancel
Save