diff options
Diffstat (limited to 'lib/python/qmk/commands.py')
| -rw-r--r-- | lib/python/qmk/commands.py | 26 | 
1 files changed, 11 insertions, 15 deletions
| diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index b1eac13957..ab8e323edf 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py @@ -9,7 +9,7 @@ from pathlib import Path  from milc import cli  import jsonschema -from qmk.constants import KEYBOARD_OUTPUT_PREFIX +from qmk.constants import INTERMEDIATE_OUTPUT_PREFIX  from qmk.json_schema import json_load, validate @@ -134,16 +134,13 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa      keyboard_filesafe = user_keymap['keyboard'].replace('/', '_')      target = f'{keyboard_filesafe}_{user_keymap["keymap"]}' -    keyboard_output = Path(f'{KEYBOARD_OUTPUT_PREFIX}{keyboard_filesafe}') -    keymap_output = Path(f'{keyboard_output}_{user_keymap["keymap"]}') -    keymap_dir = keymap_output / 'src' +    intermediate_output = Path(f'{INTERMEDIATE_OUTPUT_PREFIX}{keyboard_filesafe}_{user_keymap["keymap"]}') +    keymap_dir = intermediate_output / 'src'      keymap_json = keymap_dir / 'keymap.json'      if clean: -        if keyboard_output.exists(): -            shutil.rmtree(keyboard_output) -        if keymap_output.exists(): -            shutil.rmtree(keymap_output) +        if intermediate_output.exists(): +            shutil.rmtree(intermediate_output)      # begin with making the deepest folder in the tree      keymap_dir.mkdir(exist_ok=True, parents=True) @@ -183,13 +180,12 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa          f'KEYMAP={user_keymap["keymap"]}',          f'KEYBOARD_FILESAFE={keyboard_filesafe}',          f'TARGET={target}', -        f'KEYBOARD_OUTPUT={keyboard_output}', -        f'KEYMAP_OUTPUT={keymap_output}', -        f'MAIN_KEYMAP_PATH_1={keymap_output}', -        f'MAIN_KEYMAP_PATH_2={keymap_output}', -        f'MAIN_KEYMAP_PATH_3={keymap_output}', -        f'MAIN_KEYMAP_PATH_4={keymap_output}', -        f'MAIN_KEYMAP_PATH_5={keymap_output}', +        f'INTERMEDIATE_OUTPUT={intermediate_output}', +        f'MAIN_KEYMAP_PATH_1={intermediate_output}', +        f'MAIN_KEYMAP_PATH_2={intermediate_output}', +        f'MAIN_KEYMAP_PATH_3={intermediate_output}', +        f'MAIN_KEYMAP_PATH_4={intermediate_output}', +        f'MAIN_KEYMAP_PATH_5={intermediate_output}',          f'KEYMAP_JSON={keymap_json}',          f'KEYMAP_PATH={keymap_dir}',          f'VERBOSE={verbose}', | 
