diff options
| author | Joel Challis <git@zvecr.com> | 2020-03-17 21:28:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 21:28:13 +0000 |
| commit | e34764502f7fdd0e1104b18fb4ddf77a352ee2a7 (patch) | |
| tree | 8f93b166e9510843aaf7cf4e70bdb38679850770 /tmk_core | |
| parent | 8b0efc21246d8e6671236511b8107a05d739c152 (diff) | |
| download | qmk_firmware-e34764502f7fdd0e1104b18fb4ddf77a352ee2a7.tar.gz qmk_firmware-e34764502f7fdd0e1104b18fb4ddf77a352ee2a7.zip | |
Remove qmk archive generation (#8462)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 24 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 24 |
2 files changed, 0 insertions, 48 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 1525391a4..2c65a34aa 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -98,30 +98,6 @@ ifndef TEENSY_LOADER_CLI | |||
| 98 | endif | 98 | endif |
| 99 | endif | 99 | endif |
| 100 | 100 | ||
| 101 | # Generate a .qmk for the QMK-FF | ||
| 102 | qmk: $(BUILD_DIR)/$(TARGET).hex | ||
| 103 | zip $(TARGET).qmk -FSrj $(KEYMAP_PATH)/* | ||
| 104 | zip $(TARGET).qmk -u $< | ||
| 105 | printf "@ $<\n@=firmware.hex\n" | zipnote -w $(TARGET).qmk | ||
| 106 | printf "{\n \"generated\": \"%s\"\n}" "$$(date)" > $(BUILD_DIR)/$(TARGET).json | ||
| 107 | if [ -f $(KEYBOARD_PATH_5)/info.json ]; then \ | ||
| 108 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_5)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 109 | fi | ||
| 110 | if [ -f $(KEYBOARD_PATH_4)/info.json ]; then \ | ||
| 111 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_4)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 112 | fi | ||
| 113 | if [ -f $(KEYBOARD_PATH_3)/info.json ]; then \ | ||
| 114 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_3)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 115 | fi | ||
| 116 | if [ -f $(KEYBOARD_PATH_2)/info.json ]; then \ | ||
| 117 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_2)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 118 | fi | ||
| 119 | if [ -f $(KEYBOARD_PATH_1)/info.json ]; then \ | ||
| 120 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_1)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 121 | fi | ||
| 122 | zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json | ||
| 123 | printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk | ||
| 124 | |||
| 125 | # Program the device. | 101 | # Program the device. |
| 126 | program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep check-size | 102 | program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep check-size |
| 127 | $(PROGRAM_CMD) | 103 | $(PROGRAM_CMD) |
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 577603080..014019ef0 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
| @@ -244,30 +244,6 @@ EXTRALIBDIRS = $(RULESPATH)/ld | |||
| 244 | DFU_UTIL ?= dfu-util | 244 | DFU_UTIL ?= dfu-util |
| 245 | ST_LINK_CLI ?= st-link_cli | 245 | ST_LINK_CLI ?= st-link_cli |
| 246 | 246 | ||
| 247 | # Generate a .qmk for the QMK-FF | ||
| 248 | qmk: $(BUILD_DIR)/$(TARGET).bin | ||
| 249 | zip $(TARGET).qmk -FSrj $(KEYMAP_PATH)/* | ||
| 250 | zip $(TARGET).qmk -u $< | ||
| 251 | printf "@ $<\n@=firmware.bin\n" | zipnote -w $(TARGET).qmk | ||
| 252 | printf "{\n \"generated\": \"%s\"\n}" "$$(date)" > $(BUILD_DIR)/$(TARGET).json | ||
| 253 | if [ -f $(KEYBOARD_PATH_5)/info.json ]; then \ | ||
| 254 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_5)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 255 | fi | ||
| 256 | if [ -f $(KEYBOARD_PATH_4)/info.json ]; then \ | ||
| 257 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_4)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 258 | fi | ||
| 259 | if [ -f $(KEYBOARD_PATH_3)/info.json ]; then \ | ||
| 260 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_3)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 261 | fi | ||
| 262 | if [ -f $(KEYBOARD_PATH_2)/info.json ]; then \ | ||
| 263 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_2)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 264 | fi | ||
| 265 | if [ -f $(KEYBOARD_PATH_1)/info.json ]; then \ | ||
| 266 | jq -s '.[0] * .[1]' $(BUILD_DIR)/$(TARGET).json $(KEYBOARD_PATH_1)/info.json | ex -sc 'wq!$(BUILD_DIR)/$(TARGET).json' /dev/stdin; \ | ||
| 267 | fi | ||
| 268 | zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json | ||
| 269 | printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk | ||
| 270 | |||
| 271 | define EXEC_DFU_UTIL | 247 | define EXEC_DFU_UTIL |
| 272 | until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ | 248 | until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ |
| 273 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ | 249 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ |