diff options
| author | Jesse Vincent <jesse@keyboard.io> | 2017-05-23 18:29:30 -0700 |
|---|---|---|
| committer | Jesse Vincent <jesse@keyboard.io> | 2017-05-23 18:29:30 -0700 |
| commit | e92cdf6b58b655eae2332c367a175797802e86a7 (patch) | |
| tree | b676ced582a776c635dffcfdaff335d106985a18 | |
| parent | Cut down the example key layouts (diff) | |
| download | keyboardio-model01-e92cdf6b58b655eae2332c367a175797802e86a7.tar.gz keyboardio-model01-e92cdf6b58b655eae2332c367a175797802e86a7.tar.bz2 keyboardio-model01-e92cdf6b58b655eae2332c367a175797802e86a7.zip | |
Switch to more standard kaleidoscope plugin build infra
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rw-r--r-- | Makefile | 27 |
2 files changed, 14 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml index b61d8af..e7030ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,11 @@ -language: c -before_install: -- pushd .. -- wget http://downloads.arduino.cc/arduino-1.6.11-linux64.tar.xz -- tar xf arduino-1.6.11-linux64.tar.xz -- popd +dist: trusty +sudo: false +os: + - linux install: -- pushd .. -- mkdir -p arduino-local/hardware/keyboardio -- git clone https://github.com/keyboardio/Arduino-Boards arduino-local/hardware/keyboardio/avr -- cd arduino-local/hardware/keyboardio/avr -- git submodule sync --recursive -- git submodule update --init --recursive -- popd + - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr script: -- make ARDUINO_PATH=../arduino-1.6.11 ARDUINO_LOCAL_LIB_PATH=../arduino-local build-all + - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware notifications: irc: channels: @@ -25,7 +17,5 @@ notifications: email: on_success: change on_failure: change - slack: - secure: geVAHVhYQ5bY7ja5vx1Tgxc5y64WLuXVEWKmw4LqiThFYCjtpdWkHGiZJfhUwkVI11u5w8w1FUmrB7ZP4EUGoXhCK/z1mvVMVJ9+fS+WoaqcTHFJi0hGbvXaFPD7QA+ef7TLrFcU643kf6KHN/P+dVVndLyhctXZqOZHHwXmKZNMt8qM5Gh5h41HOi0YjT9yFafSU0qf5jphF5qvjlxKsVJF+WxtMSU4xMYxzq7rf80bPi2pu4ijgqR5+Haaa71DJ1V2TA4wZ+BFTBo2YUJIGZ8qDlqmb7RdF/u72G/8HbT/Hzj55blrpBXU/BPkokGOPJlIGHPV76ESpJI0ZUILRifmkZY6ylMjl/hutDYPNjhMq8Z/UKSLN6pJQAq0PjqAoHCtPsXTbRMT0lhVt2itkCPwAXVgszTrE6INsNylY/soaDu66Sjmz2zQH8sC6hbL8SrZ0xGs1Q+e3q5WMETPIAS9f4n2YCxkIz4ORoL9IrOXUcebVNriiWKzOBt6bleWPJlGc6yVYkkUhvURH+jEp6v2Y5SqsaJVTD3I5Gq/H/0PJBtPdzu470yQ3/FD4g6M0AmWx8DCuvl1O295QOZbUtujpIowTm7PynFrAgW3ptSidjzWjzZaHc0iQJBiNi86dg3GomoEEOPzx8hnX7fhFgsR+Ixqfzx0srrQYqleQGY= cache: ccache: true @@ -1,23 +1,12 @@ -## Platform-specific overrides -# Shamelessly stolen from git's Makefile -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +# This stub makefile for a Kaleidoscope plugin pulls in +# all targets from the Kaleidoscope-Plugin library -ARDUINO_HARDWARE_PATH=${HOME}/Arduino/hardware +MAKEFILE_PREFIX=keyboardio/avr/libraries/Kaleidoscope-Plugin/build +UNAME_S := $(shell uname -s) -ifeq ($(uname_S),Darwin) - ARDUINO_HARDWARE_PATH=${HOME}/Documents/Arduino/hardware +BOARD_HARDWARE_PATH ?= $(HOME)/Arduino/hardware +ifeq ($(UNAME_S),Darwin) +BOARD_HARDWARE_PATH ?= $(HOME)/Library/Arduino/hardware endif -BUILDER_PATH=${ARDUINO_HARDWARE_PATH}/keyboardio/avr/libraries/Kaleidoscope/tools/kaleidoscope-builder - - -# default action for `make` is `build` -build: - -astyle: - find . -type f -name \*.cpp |xargs -n 1 astyle --style=google - find . -type f -name \*.ino |xargs -n 1 astyle --style=google - find . -type f -name \*.h |xargs -n 1 astyle --style=google - -%: - ${BUILDER_PATH} $@ +include $(BOARD_HARDWARE_PATH)/$(MAKEFILE_PREFIX)/*.mk |