From 9c3a7febbac4682f60dc4a5b7aae5c3230165208 Mon Sep 17 00:00:00 2001 From: jiangming1399 Date: Mon, 13 Apr 2020 19:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86ch554=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BAbin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 3 ++- keyboard/Makefile | 2 +- keyboard/ergoconn/Makefile | 2 +- keyboard/farad69/Makefile | 2 +- keyboard/gt-ble60/Makefile | 2 +- keyboard/lot60-ble/Makefile | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d033769c3..c2c05ce46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ script: - cp template/Makefile.posix.template template/Makefile.posix - sed -i "s/\/usr\/local/\/tmp/g" template/Makefile.posix - cp -r /tmp/sdk/nRF5_SDK_15.3.0_59ac345/* SDK/ + - git status - cd keyboard - make -j - cd ../ @@ -29,7 +30,7 @@ deploy: file_glob: true file: - keyboard/_build/*.zip - - keyboard/_build/*.hex + - keyboard/_build/*.bin skip_cleanup: true on: tags: true diff --git a/keyboard/Makefile b/keyboard/Makefile index ef9768a24..9106b67e2 100644 --- a/keyboard/Makefile +++ b/keyboard/Makefile @@ -11,7 +11,7 @@ all: $(SUBDIRS) $(SUBDIRS): $(OUTPUT_DIR) @-mkdir $(OUTPUT_DIR)/$@ @make -C $@ package OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ NRF_PACKAGE_NAME=$(RELEASE_DIR)/$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$@ - @make -C $@ usb OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ OUTPUT_HEX=$(RELEASE_DIR)/$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$@ + @make -C $@ usb OUTPUT_DIRECTORY=$(RELEASE_DIR)/$@ OUTPUT_BIN=$(RELEASE_DIR)/$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$@ $(OUTPUT_DIR): @-mkdir -p $(OUTPUT_DIR) diff --git a/keyboard/ergoconn/Makefile b/keyboard/ergoconn/Makefile index ae5a7857b..2106d88c3 100644 --- a/keyboard/ergoconn/Makefile +++ b/keyboard/ergoconn/Makefile @@ -22,7 +22,7 @@ all: $(SUBDIRS) $(SUBDIRS): $(OUTPUT_DIR) @-mkdir -p $(OUTPUT_DIR)/$@ @make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@ - @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@ + @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@ $(OUTPUT_DIR): @-mkdir -p $(OUTPUT_DIR) diff --git a/keyboard/farad69/Makefile b/keyboard/farad69/Makefile index ae5a7857b..2106d88c3 100644 --- a/keyboard/farad69/Makefile +++ b/keyboard/farad69/Makefile @@ -22,7 +22,7 @@ all: $(SUBDIRS) $(SUBDIRS): $(OUTPUT_DIR) @-mkdir -p $(OUTPUT_DIR)/$@ @make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@ - @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@ + @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@ $(OUTPUT_DIR): @-mkdir -p $(OUTPUT_DIR) diff --git a/keyboard/gt-ble60/Makefile b/keyboard/gt-ble60/Makefile index ae5a7857b..2106d88c3 100644 --- a/keyboard/gt-ble60/Makefile +++ b/keyboard/gt-ble60/Makefile @@ -22,7 +22,7 @@ all: $(SUBDIRS) $(SUBDIRS): $(OUTPUT_DIR) @-mkdir -p $(OUTPUT_DIR)/$@ @make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@ - @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@ + @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@ $(OUTPUT_DIR): @-mkdir -p $(OUTPUT_DIR) diff --git a/keyboard/lot60-ble/Makefile b/keyboard/lot60-ble/Makefile index ae5a7857b..2106d88c3 100644 --- a/keyboard/lot60-ble/Makefile +++ b/keyboard/lot60-ble/Makefile @@ -22,7 +22,7 @@ all: $(SUBDIRS) $(SUBDIRS): $(OUTPUT_DIR) @-mkdir -p $(OUTPUT_DIR)/$@ @make -C $@ package OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ NRF_PACKAGE_NAME=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-nrf52-$(FILE_VERSION).zip BUILD_PREFIX=$(BUILD_PREFIX)-$@ - @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_HEX=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).hex BUILD_PREFIX=$(BUILD_PREFIX)-$@ + @make -C $@ usb OUTPUT_DIRECTORY=../$(OUTPUT_DIR)/$@ OUTPUT_BIN=../$(RELEASE_DIR)/$(BUILD_PREFIX)-$@-ch554-$(FILE_VERSION).bin BUILD_PREFIX=$(BUILD_PREFIX)-$@ $(OUTPUT_DIR): @-mkdir -p $(OUTPUT_DIR)