--- a/contrib/install-windows-dependencies.ps1 Mon Apr 18 16:18:33 2022 -0400
+++ b/contrib/install-windows-dependencies.ps1 Fri Apr 15 11:32:27 2022 -0400
@@ -90,7 +90,13 @@
$p = Start-Process -FilePath $path -ArgumentList $arguments -Wait -PassThru -WindowStyle Hidden
if ($p.ExitCode -ne 0) {
- throw "process exited non-0: $($p.ExitCode)"
+ # If the MSI is already installed, ignore the error
+ if ($p.ExitCode -eq 1638) {
+ Write-Output "program already installed; continuing..."
+ }
+ else {
+ throw "process exited non-0: $($p.ExitCode)"
+ }
}
}
@@ -150,7 +156,7 @@
Install-Python3 "Python 3.7 32-bit" ${prefix}\assets\python37-x86.exe ${prefix}\python37-x86 ${pip}
Install-Python3 "Python 3.7 64-bit" ${prefix}\assets\python37-x64.exe ${prefix}\python37-x64 ${pip}
Install-Python3 "Python 3.8 32-bit" ${prefix}\assets\python38-x86.exe ${prefix}\python38-x86 ${pip}
-# Install-Python3 "Python 3.8 64-bit" ${prefix}\assets\python38-x64.exe ${prefix}\python38-x64 ${pip}
+ Install-Python3 "Python 3.8 64-bit" ${prefix}\assets\python38-x64.exe ${prefix}\python38-x64 ${pip}
Install-Python3 "Python 3.9 32-bit" ${prefix}\assets\python39-x86.exe ${prefix}\python39-x86 ${pip}
Install-Python3 "Python 3.9 64-bit" ${prefix}\assets\python39-x64.exe ${prefix}\python39-x64 ${pip}
Install-Python3 "Python 3.10 32-bit" ${prefix}\assets\python310-x86.exe ${prefix}\python310-x86 ${pip}