From 03f9843c3bb5074de126d628c73e41d090292cd9 Mon Sep 17 00:00:00 2001 From: Quint Guvernator Date: Fri, 9 Oct 2015 14:38:29 +0200 Subject: [PATCH] Fix finding boards.txt (#42) on newer OSX The newest builds of the Arduino IDE keep the `hardware/` tree under `Arduino.app/Contents/Java` rather than `Arduino.app/Contents/Resources/Java`. Fixes #42. --- ino/environment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ino/environment.py b/ino/environment.py index 8cb27e8..ad062c7 100644 --- a/ino/environment.py +++ b/ino/environment.py @@ -80,6 +80,7 @@ class Environment(dict): if platform.system() == 'Darwin': arduino_dist_dir_guesses.insert(0, '/Applications/Arduino.app/Contents/Resources/Java') + arduino_dist_dir_guesses.insert(0, '/Applications/Arduino.app/Contents/Java') default_board_model = 'uno' ino = sys.argv[0] @@ -214,7 +215,7 @@ def board_models(self): # boards.txt can be placed in following places # - hardware/arduino/boards.txt (Arduino IDE 0.xx, 1.0.x) - # - hardware/arduino/{chipset}/boards.txt (Arduino 1.5.x, chipset like `avr`, `sam`) + # - hardware/arduino/{chipset}/boards.txt (Arduino 1.5.x-1.6.x, chipset like `avr`, `sam`) # - hardware/{platform}/boards.txt (MPIDE 0.xx, platform like `arduino`, `pic32`) # we should find and merge them all boards_txts = self.find_arduino_file('boards.txt', ['hardware', '**'],