drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Enable 'keyboard.json' as a build target (#22891)

Browse source
This commit is contained in:
Joel Challis 2024-03-10 05:20:25 +00:00 • committed by GitHub
parent c5225ab500
commit 9f4a9d5826
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/python/qmk/info.py
View file

@ -863,7 +863,17 @@ def unknown_processor_rules(info_data, rules):
def merge_info_jsons(keyboard, info_data):
"""Return a merged copy of all the info.json files for a keyboard.
"""
for info_file in find_info_json(keyboard):
config_files = find_info_json(keyboard)
# keyboard.json can only exist at the deepest part of the tree
keyboard_json_count = 0
for index, info_file in enumerate(config_files):
if Path(info_file).name == 'keyboard.json':
keyboard_json_count += 1
if index != 0 or keyboard_json_count > 1:
_log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
for info_file in config_files:
# Load and validate the JSON data
new_info_data = json_load(info_file)
@ -921,7 +931,7 @@ def find_info_json(keyboard):
base_path = Path('keyboards')
keyboard_path = base_path / keyboard
keyboard_parent = keyboard_path.parent
info_jsons = [keyboard_path / 'info.json']
info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json']
# Add DEFAULT_FOLDER before parents, if present
rules = rules_mk(keyboard)
@ -933,6 +943,7 @@ def find_info_json(keyboard):
if keyboard_parent == base_path:
break
info_jsons.append(keyboard_parent / 'info.json')
info_jsons.append(keyboard_parent / 'keyboard.json')
keyboard_parent = keyboard_parent.parent
# Return a list of the info.json files that actually exist