Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First pass at some boards.txt handling where no Arduino IDE only GCC AVR #470

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

First pass at some boards.txt handling where no Arduino IDE only GCC AVR #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions build/Arduino-Makefile/Arduino.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,6 @@ else

endif

# Check if boards.txt should be generated from installed cores. Assume that
# variant files have been added (symbol links).
BOARDS_TXT_AVAILABLE := $(call dir_if_exists,$(BOARDS_TXT))
ifndef BOARDS_TXT_AVAILABLE
BOARDS_TXT_CAT := $(shell cat $(ARDUINO_SKETCHBOOK)/hardware/*/boards.txt > $(BOARDS_TXT))
endif

########################################################################
# Miscellaneous

Expand Down
11 changes: 10 additions & 1 deletion build/Cosa.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,16 @@ ARDMK_DIR = $(COSA_DIR)/build/Arduino-Makefile
ARDUINO_CORE_PATH = $(COSA_DIR)/cores/cosa
ARDUINO_VAR_PATH = $(COSA_DIR)/variants
ARDUINO_LIB_PATH = $(COSA_DIR)/libraries
BOARDS_TXT = $(COSA_DIR)/build/boards.txt
ifndef BOARDS_TXT
BOARDS_TXT = $(COSA_DIR)/build/boards.txt
endif
ifeq ("$(wildcard $(BOARDS_TXT))", "")
$(shell cat $(COSA_DIR)/boards/*.txt > $(BOARDS_TXT))
BOARDS_TXT_MORE := $(wildcard $(ARDUINO_SKETCHBOOK)/hardware/*/boards.txt)
ifdef BOARDS_TXT_MORE
$(shell cat $BOARDS_TXT_MORE >> $(BOARDS_TXT))
endif
endif

MONITOR_CMD = $(COSA_DIR)/build/miniterm.py -q --lf

Expand Down