aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-05-06 10:56:34 -0700
committerGitHub <noreply@github.com>2019-05-06 10:56:34 -0700
commit99500243e10c12c0a5005da49aa1986947b27153 (patch)
tree7b33f10fcc52f6578f84830c823e518557168ccf
parentcb1935aaff0fed118954996fc7afb722b6ed21be (diff)
downloadfirmware-99500243e10c12c0a5005da49aa1986947b27153.tar.gz
firmware-99500243e10c12c0a5005da49aa1986947b27153.tar.bz2
firmware-99500243e10c12c0a5005da49aa1986947b27153.zip
Make python a required build dependency (#5784)
* Make python a required build dependency * Add missing color * fixup sabayon linux per @BlitzKraft
-rw-r--r--Makefile2
-rw-r--r--message.mk4
-rwxr-xr-xutil/freebsd_install.sh3
-rwxr-xr-xutil/linux_install.sh9
-rwxr-xr-xutil/macos_install.sh2
-rwxr-xr-xutil/msys2_install.sh2
6 files changed, 18 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index bf3abbe52..a6c3ee35b 100644
--- a/Makefile
+++ b/Makefile
@@ -534,6 +534,8 @@ endef
%:
# Check if we have the CMP tool installed
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
+ # Ensure that python3 is installed. This check can be removed after python is used in more places.
+ if ! python3 --version 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; fi
# Check if the submodules are dirty, and display a warning if they are
ifndef SKIP_GIT
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 1 --init lib/chibios; fi
diff --git a/message.mk b/message.mk
index 71f37be0b..734de8645 100644
--- a/message.mk
+++ b/message.mk
@@ -81,3 +81,7 @@ MSG_FILE_TOO_BIG = $(ERROR_COLOR)The firmware is too large!$(NO_COLOR) $(CURRENT
MSG_FILE_TOO_SMALL = The firmware is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n
MSG_FILE_JUST_RIGHT = The firmware size is fine - $(CURRENT_SIZE)/$(MAX_SIZE) ($(FREE_SIZE) bytes free)\n
MSG_FILE_NEAR_LIMIT = The firmware size is approaching the maximum - $(CURRENT_SIZE)/$(MAX_SIZE) ($(FREE_SIZE) bytes free)\n
+MSG_PYTHON_MISSING = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \
+ Python 3 is not installed. It will be required by a future version\n\
+ of qmk_firmware.\n\n\
+ Please run $(BOLD)util/qmk_install.sh$(NO_COLOR) to install all the dependencies QMK requires.\n\n
diff --git a/util/freebsd_install.sh b/util/freebsd_install.sh
index 25ea80a7f..c8696e8cc 100755
--- a/util/freebsd_install.sh
+++ b/util/freebsd_install.sh
@@ -15,4 +15,5 @@ pkg install -y \
arm-none-eabi-gcc \
arm-none-eabi-binutils \
arm-none-eabi-newlib \
- diffutils
+ diffutils \
+ python3
diff --git a/util/linux_install.sh b/util/linux_install.sh
index 608975a91..5e2afe999 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -25,6 +25,7 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
kernel-headers \
make \
perl \
+ python3 \
unzip \
wget \
zip
@@ -47,6 +48,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
gcc-avr \
git \
libnewlib-arm-none-eabi \
+ python3 \
unzip \
wget \
zip
@@ -66,6 +68,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
diffutils \
gcc \
git \
+ python \
unzip \
wget \
zip
@@ -87,6 +90,7 @@ elif grep ID /etc/os-release | grep -q gentoo; then
app-arch/zip \
app-mobilephone/dfu-util \
dev-embedded/avrdude \
+ dev-lang/python:3.5 \
net-misc/wget \
sys-devel/gcc \
sys-devel/crossdev
@@ -102,6 +106,7 @@ elif grep ID /etc/os-release | grep -q sabayon; then
app-arch/zip \
app-mobilephone/dfu-util \
dev-embedded/avrdude \
+ dev-lang/python \
net-misc/wget \
sys-devel/gcc \
sys-devel/crossdev
@@ -125,6 +130,7 @@ elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then
dfu-tool \
dfu-programmer \
gcc \
+ python3 \
unzip \
wget \
zip
@@ -143,7 +149,8 @@ elif grep ID /etc/os-release | grep -q slackware; then
dfu-util \
arm-binutils \
arm-gcc \
- newlib
+ newlib \
+ python3
echo "Done!"
else
echo "Quitting..."
diff --git a/util/macos_install.sh b/util/macos_install.sh
index d2629a8cb..93f3ed0b9 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -22,5 +22,5 @@ fi
brew tap osx-cross/avr
brew tap PX4/homebrew-px4
brew update
-brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude dfu-util
+brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
brew link --force avr-gcc@7
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index fcb488249..bcb628ab2 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -7,7 +7,7 @@ armtools=gcc-arm-none-eabi
installflip=false
echo "Installing dependencies needed for the installation (quazip)"
-pacman --needed -S msys/unzip msys/p7zip base-devel msys/git mingw-w64-x86_64-toolchain
+pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip
source "$dir/win_shared_install.sh"