From c6d9e5bc889ff06b5423aaad30e77b3325fb552f Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Thu, 11 Jun 2020 23:17:33 +0200 Subject: [PATCH] Generate virtual/boards.txt from avr/boards.txt instead of linking them When building the virtual boards, we want to have the base core as `keyboardio:arduino`, instead of `arduino:arduino`, because we provide the base ourselves. To this end, instead of symlinking `avr/boards.txt` and `virtual/boards.txt`, generate the latter from the former. Once we have other architectures, such as SAMD, we can concat all the boards.txt files and do the same `base.core` replacements. This is a pre-requisite for keyboardio/Kaleidoscope#851. Signed-off-by: Gergely Nagy --- .gitignore | 1 + .travis.yml | 1 + Makefile | 3 +++ virtual/boards.txt | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) delete mode 120000 virtual/boards.txt diff --git a/.gitignore b/.gitignore index 873e95d..ce5e934 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ arduino-*-linux64.tar.xz arduino-* +/virtual/boards.txt \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cdd4eb8..088e8b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ install: - mkdir -p ../hardware/ - ln -s `pwd` ../hardware/keyboardio script: +- make prepare-virtual - make travis-test-all BOARD_HARDWARE_PATH=$(pwd)/../hardware branches: except: diff --git a/Makefile b/Makefile index 77bbd42..7cf1786 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,9 @@ KALEIDOSCOPE_BUILDER_DIR ?= ./avr/libraries/Kaleidoscope/bin/ endif +prepare-virtual: + sed -e "s/\(.*\)\.build\.core=arduino:arduino/\1.build.core=keyboardio:arduino/" avr/boards.txt >virtual/boards.txt + update-submodules: checkout-submodules @echo "All Kaleidoscope libraries have been updated from GitHub" diff --git a/virtual/boards.txt b/virtual/boards.txt deleted file mode 120000 index 725a090..0000000 --- a/virtual/boards.txt +++ /dev/null @@ -1 +0,0 @@ -../avr/boards.txt \ No newline at end of file