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

MSYS2: install packages for AVR toolchain (#10078)

This commit is contained in:
Ryan 2020-08-25 19:04:42 +10:00 committed by GitHub
parent 5460489b51
commit c9c63806a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/activate_msys2.sh
View File

@ -3,7 +3,6 @@
function export_variables { function export_variables {
local util_dir=~/qmk_utils local util_dir=~/qmk_utils
export PATH=$PATH:$util_dir export PATH=$PATH:$util_dir
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
} }

33
util/msys2_install.sh
View File

@ -2,25 +2,18 @@
dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
download_dir=~/qmk_utils download_dir=~/qmk_utils
avrtools=avr8-gnu-toolchain
armtools=gcc-arm-none-eabi armtools=gcc-arm-none-eabi
util_dir=$(dirname "$0") util_dir=$(dirname "$0")
echo "Installing dependencies needed for the installation (quazip)" echo "Installing dependencies needed for the installation"
pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip
source "$dir/win_shared_install.sh" source "$dir/win_shared_install.sh"
function install_avr { function install_avr {
rm -f -r "$avrtools" pacman --needed --noconfirm --disable-download-timeout -S \
wget "https://blog.zakkemble.net/download/avr-gcc-8.3.0-x86-mingw.zip" mingw-w64-x86_64-avr-binutils mingw-w64-x86_64-avr-gcc mingw-w64-x86_64-avr-libc \
echo "Extracting AVR toolchain..." mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
unzip -q -d . avr-gcc-8.3.0-x86-mingw.zip
mv avr-gcc-8.3.0-x86-mingw avr8-gnu-toolchain
rm avr8-gnu-toolchain/bin/make.exe
rm avr-gcc-8.3.0-x86-mingw.zip
pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
} }
function install_arm { function install_arm {
@ -35,23 +28,7 @@ function install_arm {
pushd "$download_dir" pushd "$download_dir"
if [ ! -d "$avrtools" ]; then install_avr
echo
echo "The AVR toolchain is not installed."
echo "This is needed for building AVR based keyboards."
install_avr
else
while true; do
echo
echo "The AVR toolchain is already installed"
read -p "Do you want to reinstall? (Y/N) " res
case $res in
[Yy]* ) install_avr; break;;
[Nn]* ) break;;
* ) echo "Invalid answer";;
esac
done
fi
if [ ! -d "$armtools" ]; then if [ ! -d "$armtools" ]; then
echo echo