tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSYS2 install: use MinGW python-qmk package (#17302) 

* MSYS2 install: use MinGW python-qmk package

* Add missing flashers

* Note VC Redist for manual install

* VC Redist no longer needed
master
Ryan 2022-07-03 00:08:05 +10:00 committed by GitHub
parent 1cffe5b6ce
commit 25033d5d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/newbs_getting_started.md
View File

@ -36,21 +36,15 @@ Alternatively, if you'd like to manually install MSYS2, the following section wi
#### Prerequisites #### Prerequisites
You will need to install MSYS2, Git and Python. Follow the installation instructions on https://www.msys2.org. You will need to install [MSYS2](https://www.msys2.org). Once installed, close any open MSYS terminals (purple icon) and open a new MinGW 64-bit terminal (blue icon) from the Start Menu.
Once MSYS2 is installed, close any open MSYS terminals and open a new MinGW 64-bit terminal.
!> **NOTE:** The MinGW 64-bit terminal is *not* the same as the MSYS terminal that opens when installation is completed. Your prompt should say "MINGW64" in purple text, rather than "MSYS". See [this page](https://www.msys2.org/wiki/MSYS2-introduction/#subsystems) for more information on the differences. !> **NOTE:** The MinGW 64-bit terminal is *not* the same as the MSYS terminal that opens when installation is completed. Your prompt should say "MINGW64" in purple text, rather than "MSYS". See [this page](https://www.msys2.org/wiki/MSYS2-introduction/#subsystems) for more information on the differences.
Then run the following command:
pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python3-pip mingw-w64-x86_64-python-pillow
#### Installation #### Installation
Install the QMK CLI by running: Install the QMK CLI by running:
python3 -m pip install qmk pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-python-qmk
</details> </details>

13
util/install/msys2.sh
View File

@ -7,17 +7,14 @@ _qmk_install_prepare() {
_qmk_install() { _qmk_install() {
echo "Installing dependencies" echo "Installing dependencies"
pacman --needed --noconfirm --disable-download-timeout -S pactoys-git pacman --needed --noconfirm --disable-download-timeout -S pactoys
pacboy sync --needed --noconfirm --disable-download-timeout \ pacboy sync --needed --noconfirm --disable-download-timeout \
base-devel: toolchain:x clang:x git: unzip: python3-pip:x \ base-devel: toolchain:x clang:x python-qmk:x hidapi:x \
avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x \ avr-binutils:x avr-gcc:x avr-libc:x \
arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x \ arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \
dfu-programmer:x dfu-util:x teensy-loader-cli:x hidapi:x \ avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x
python-appdirs:x python-colorama:x python-jsonschema:x python-pillow:x python-pygments:x
_qmk_install_drivers _qmk_install_drivers
python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt"
} }
_qmk_install_drivers() { _qmk_install_drivers() {