summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-08-15 22:03:26 +0100
committerFlorian Didron <fdidron@users.noreply.github.com>2019-08-28 14:47:26 +0900
commitba5c46267c807686d240c604f8c42b70f5168d70 (patch)
tree1b7142845f56fcfec8fa70b19bd57daa16f668b6
parentfd63ea595f17face0dcf5ce935e58cea1c724ff6 (diff)
Add an alternative method for keyboard discovery to speed up build (#6073)
* Add an alternative method for keyboard discovery to speed up build * Chain MAKEFLAGS for docker_build.sh * Slight improvement to number of items sent to sort * Remove debug line * Fix line escape
-rw-r--r--Makefile9
-rwxr-xr-xutil/docker_build.sh8
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a6c3ee35b7..6512f7217e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,10 @@ endif
override SILENT := false
ifndef SUB_IS_SILENT
-QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
+ifndef SKIP_GIT
+ QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
+endif
+
ifneq ($(QMK_VERSION),)
$(info QMK Firmware $(QMK_VERSION))
endif
@@ -94,6 +97,7 @@ $(eval $(call NEXT_PATH_ELEMENT))
# endif
define GET_KEYBOARDS
+ifndef ALT_GET_KEYBOARDS
All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))
All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk))
@@ -105,6 +109,9 @@ define GET_KEYBOARDS
KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk))
KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK)))
+else
+ KEYBOARDS := $(shell find keyboards/ -type f -iname "rules.mk" | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | sort | uniq)
+endif
endef
$(eval $(call GET_KEYBOARDS))
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 1e17bfbedc..738f1c7153 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -46,5 +46,11 @@ fi
dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
# Run container and build firmware
-docker run --rm -it $usb_args -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \
+docker run --rm -it $usb_args \
+ -w /qmk_firmware/ \
+ -v "$dir":/qmk_firmware \
+ -e ALT_GET_KEYBOARDS=true \
+ -e SKIP_GIT="$SKIP_GIT" \
+ -e MAKEFLAGS="$MAKEFLAGS" \
+ qmkfm/base_container \
make "$keyboard${keymap:+:$keymap}${target:+:$target}"