mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-22 08:24:41 +00:00
Proper parsing of keymaps inside subprojects
This commit is contained in:
parent
44441de8ca
commit
2dd9c1edcd
1 changed files with 21 additions and 5 deletions
26
Makefile
26
Makefile
|
@ -131,16 +131,32 @@ endef
|
||||||
# $1 Subproject
|
# $1 Subproject
|
||||||
define PARSE_SUBPROJECT
|
define PARSE_SUBPROJECT
|
||||||
ifeq ($1,defaultsp)
|
ifeq ($1,defaultsp)
|
||||||
|
SUBPROJECT_DEFAULT=
|
||||||
$$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile)
|
$$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile)
|
||||||
CURRENT_SP := $$(SUBPROJECT_DEFAULT)
|
CURRENT_SP := $$(SUBPROJECT_DEFAULT)
|
||||||
else
|
else
|
||||||
CURRENT_SP := $1
|
CURRENT_SP := $1
|
||||||
endif
|
endif
|
||||||
KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.)))
|
# If current subproject is empty (the default was not defined), and we have a list of subproject
|
||||||
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true)
|
# then make all
|
||||||
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
ifeq ($$(CURRENT_SP),)
|
||||||
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
|
ifneq ($$(SUBPROJECTS),)
|
||||||
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
|
CURRENT_SP := allsp
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifneq ($$(CURRENT_SP),allsp)
|
||||||
|
KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.)))
|
||||||
|
ifneq ($$(CURRENT_SP),)
|
||||||
|
SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.)))
|
||||||
|
KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS))
|
||||||
|
endif
|
||||||
|
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true)
|
||||||
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
||||||
|
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
|
||||||
|
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$(SUBPROJECTS)))
|
||||||
endif
|
endif
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue