From 7844aeed5e0e252d4e7eee1a3b33a2c88940ba7b Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 3 Mar 2022 20:25:20 -0800 Subject: [PATCH] Because of how we call arduino-cli, we no longer need to play games with not checking out the copy of Kaleidoscope inside our arduino cores --- Makefile | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 816d61b6..82ec0b93 100644 --- a/Makefile +++ b/Makefile @@ -28,35 +28,18 @@ $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt: git clone -c core.symlinks=true \ - --recurse-submodules=":(exclude)avr/libraries/Kaleidoscope" \ - --recurse-submodules=":(exclude)gd32/libraries/Kaleidoscope" \ - --recurse-submodules=avr/libraries/ \ - --recurse-submodules=gd32/ \ - --recurse-submodules=gd32/libraries/ \ + --recurse-submodules \ git://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio \ $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio - -rm -d $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope - ln -s $(KALEIDOSCOPE_DIR) $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope git clone -c core.symlinks=true \ - --recurse-submodules=":(exclude)libraries/Kaleidoscope" \ - --recurse-submodules=libraries/ \ + --recurse-submodules \ git://github.com/keyboardio/ArduinoCore-GD32-Keyboardio $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32 - -rm -d $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32/libraries/Kaleidoscope - ln -s $(KALEIDOSCOPE_DIR) $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32/libraries/Kaleidoscope update: - # Clear out our hacked up symlinked Kaleidoscope - -rm -rf $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope cd $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio; git pull; \ git submodule update --init --recursive - -rm -rf $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope - ln -s $(KALEIDOSCOPE_DIR) $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope - # Clear out our hacked up Kaleidoscope - -rm -rf $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32/libraries/Kaleidoscope cd $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32; git pull; \ git submodule update --init --recursive - -rm -rf $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32/libraries/Kaleidoscope - ln -s $(KALEIDOSCOPE_DIR) $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/gd32/libraries/Kaleidoscope simulator-tests: $(MAKE) -C tests all