windows: Use rustc version from msys2

This should fix CI. This version seems fine, and doesn't require any
weird code to ensure the build script can find it correctly. Nor does it
run into some issues that I've had locally trying to build with the
toolchain from Windows rustup.

Author: ids1024

.github/workflows/ci.yml

@@ -49,10 +49,7 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW32
-        install: mingw-w64-i686-gtk3 mingw-w64-i686-toolchain mingw-w64-i686-ntldd mingw-w64-i686-imagemagick
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable-i686-pc-windows-gnu
+        install: mingw-w64-i686-gtk3 mingw-w64-i686-rust mingw-w64-i686-toolchain mingw-w64-i686-ntldd mingw-w64-i686-imagemagick
     - uses: actions/checkout@v2
     - name: Build and package
       shell: msys2 {0}
@@ -62,7 +59,7 @@ jobs:
         SSL_COM_CREDENTIAL_ID: ${{ github.event_name == 'release' && secrets.SSL_COM_CREDENTIAL_ID || '' }}
         SSL_COM_TOTP_SECRET: ${{ github.event_name == 'release' && secrets.SSL_COM_TOTP_SECRET || '' }}
         SIGN: ${{ github.event_name == 'release' && '--sign' || '' }}
-      run: cd windows && python build.py --rustup="C:/Rust/.cargo/bin/rustup.exe" $RELEASE $SIGN
+      run: cd windows && python build.py $RELEASE $SIGN
     - uses: actions/upload-artifact@v2
       with:
         if-no-files-found: error

windows/README.md

@@ -5,13 +5,10 @@
 - `libraries.wxi` -  Generated automatically by `build.py` with a list of needed dlls. Included by `keyboard-configurator.wxs`.
 
 ### Dependencies
-- [Rustup](https://rustup.rs/)
 - [MSYS2](https://www.msys2.org/)
 - [WiX Toolset](https://wixtoolset.org/)
 
-In msys2, run `pacman -S mingw-w64-i686-gtk3 mingw-w64-i686-toolchain mingw-w64-i686-ntldd mingw-w64-i686-imagemagick`.
-
-Run `rustup toolchain add stable-i686-pc-windows-gnu`.
+In msys2, run `pacman -S ingw-w64-i686-gtk3 mingw-w64-i686-rust mingw-w64-i686-toolchain mingw-w64-i686-ntldd mingw-w64-i686-imagemagick`.
 
 ### Building
 `.\build.bat` will build and generate a `.msi` installer.

windows/build.py

@@ -3,6 +3,7 @@
 import argparse
 import os
 import re
+import shlex
 import shutil
 import subprocess
 import sys
@@ -14,13 +15,11 @@
 parser = argparse.ArgumentParser()
 parser.add_argument('--release', action='store_true')
 parser.add_argument('--sign', action='store_true')
-parser.add_argument('--rustup', default=(os.environ['HOMEPATH'] + "/.cargo/bin/rustup.exe"))
+parser.add_argument('--cargo', default='cargo')
 parser.add_argument('--wix', default="C:/Program Files (x86)/WiX Toolset v3.11")
 args = parser.parse_args()
 
-# Rust toolchain version to use
-RUST_TOOLCHAIN = 'stable-i686-pc-windows-gnu'
-CARGO = [args.rustup, "run", RUST_TOOLCHAIN, "cargo"]
+CARGO = shlex.split(args.cargo)
 # Executables to install
 TARGET_DIR = "../target/" + ('release' if args.release else 'debug')
 EXES = {