diff options
author | Joel Challis <git@zvecr.com> | 2019-08-15 22:03:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-15 22:03:26 +0100 |
commit | 9813a6f950b46277eb29c54105809767cc0daa65 (patch) | |
tree | b83554648b2f06f4ab11ac47c55815f37e9e924d /Makefile | |
parent | fadb69e2031a259248dd575384da8846ba0c2aa3 (diff) | |
download | qmk_firmware-9813a6f950b46277eb29c54105809767cc0daa65.tar.gz qmk_firmware-9813a6f950b46277eb29c54105809767cc0daa65.zip |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -20,7 +20,10 @@ endif | |||
20 | override SILENT := false | 20 | override SILENT := false |
21 | 21 | ||
22 | ifndef SUB_IS_SILENT | 22 | ifndef SUB_IS_SILENT |
23 | QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null) | 23 | ifndef SKIP_GIT |
24 | QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null) | ||
25 | endif | ||
26 | |||
24 | ifneq ($(QMK_VERSION),) | 27 | ifneq ($(QMK_VERSION),) |
25 | $(info QMK Firmware $(QMK_VERSION)) | 28 | $(info QMK Firmware $(QMK_VERSION)) |
26 | endif | 29 | endif |
@@ -94,6 +97,7 @@ $(eval $(call NEXT_PATH_ELEMENT)) | |||
94 | # endif | 97 | # endif |
95 | 98 | ||
96 | define GET_KEYBOARDS | 99 | define GET_KEYBOARDS |
100 | ifndef ALT_GET_KEYBOARDS | ||
97 | All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk)) | 101 | All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk)) |
98 | All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk)) | 102 | All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk)) |
99 | All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk)) | 103 | All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk)) |
@@ -105,6 +109,9 @@ define GET_KEYBOARDS | |||
105 | KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk)) | 109 | KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk)) |
106 | 110 | ||
107 | KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK))) | 111 | KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK))) |
112 | else | ||
113 | KEYBOARDS := $(shell find keyboards/ -type f -iname "rules.mk" | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | sort | uniq) | ||
114 | endif | ||
108 | endef | 115 | endef |
109 | 116 | ||
110 | $(eval $(call GET_KEYBOARDS)) | 117 | $(eval $(call GET_KEYBOARDS)) |