dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't ignore custom boards.txt path when using a custom ard-parse-boards.

Browse source 
This splits the definition of the path to ard-parse-boards from the arguments
passed to it - most importantly the custom path to the boards.txt which changes
on different platforms. The default value for this hard-coded into
ard-parse-boards won't work in Linux or Windows, so passing the custom value is
critical.

This change also determines the absolute path to ard-parse-boards dynamically,
so the PARSE_BOARDS_PATH value should never really need to be overridden. I
removed the custom values from all of the example Makefiles.
This commit is contained in:
Christopher Peplin 2012-03-30 15:58:23 -04:00
parent f437ea63eb
commit 12a759ba8b
8 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arduino-mk/Arduino.mk
View file

@ -173,6 +173,9 @@ endif
######################################################################## ########################################################################
# The path directory this Makefile is stored in
ARDUINO_MK_PATH := $(dir $(lastword $(MAKEFILE_LIST)))
# #
# Arduino version number # Arduino version number
ifndef ARDUINO_VERSION ifndef ARDUINO_VERSION
@ -214,8 +217,16 @@ ifndef BOARDS_TXT
BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt
endif endif
ifndef PARSE_BOARD_OPTS
PARSE_BOARD_OPTS = --boards_txt=$(BOARDS_TXT)
endif
ifndef PARSE_BOARD_PATH
PARSE_BOARD_PATH = $(ARDUINO_MK_PATH)/ard-parse-boards
endif
ifndef PARSE_BOARD ifndef PARSE_BOARD
PARSE_BOARD = ard-parse-boards --boards_txt=$(BOARDS_TXT) PARSE_BOARD = $(PARSE_BOARD_PATH) $(PARSE_BOARD_OPTS)
endif endif
# Which variant ? This affects the include path # Which variant ? This affects the include path

1
examples/Blink/Makefile
View file

@ -1,5 +1,4 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*

3
examples/BlinkWithoutDelay/Makefile
View file

@ -1,9 +1,8 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*
ARDUINO_LIBS = ARDUINO_LIBS =
include ../../arduino-mk/Arduino.mk include ../../arduino-mk/Arduino.mk

3
examples/Fade/Makefile
View file

@ -1,9 +1,8 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*
ARDUINO_LIBS = ARDUINO_LIBS =
include ../../arduino-mk/Arduino.mk include ../../arduino-mk/Arduino.mk

5
examples/HelloWorld/Makefile
View file

@ -1,9 +1,6 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*
ARDUINO_LIBS = LiquidCrystal ARDUINO_LIBS = LiquidCrystal
include ../../arduino-mk/Arduino.mk include ../../arduino-mk/Arduino.mk

3
examples/WebServer/Makefile
View file

@ -1,9 +1,8 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*
ARDUINO_LIBS = Ethernet Ethernet/utility SPI ARDUINO_LIBS = Ethernet Ethernet/utility SPI
include ../../arduino-mk/Arduino.mk include ../../arduino-mk/Arduino.mk

1
examples/master_reader/Makefile
View file

@ -1,5 +1,4 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*

1
examples/toneMelody/Makefile
View file

@ -1,5 +1,4 @@
ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
PARSE_BOARD = ../../arduino-mk/ard-parse-boards
BOARD_TAG = uno BOARD_TAG = uno
ARDUINO_PORT = /dev/cu.usb* ARDUINO_PORT = /dev/cu.usb*