8000 Fixes for Arduino 1.5.1 · Issue #32 · sudar/Arduino-Makefile · GitHub
[go: up one dir, main page]

Skip to content
Fixes for Arduino 1.5.1 #32
@jcw

Description

@jcw

The Arduin 1.5.1 release breaks a few things because of a different directory layout.


diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 09819ac..87de248 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -308,8 +308,8 @@ AVR_TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin
 endif

 ARDUINO_LIB_PATH  = $(ARDUINO_DIR)/libraries
-ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino
-ARDUINO_VAR_PATH  = $(ARDUINO_DIR)/hardware/arduino/variants
+ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/avr/cores/arduino
+ARDUINO_VAR_PATH  = $(ARDUINO_DIR)/hardware/arduino/avr/variants

 else

@@ -372,7 +372,7 @@ BOARD_TAG   = uno
 endif

 ifndef BOARDS_TXT
-BOARDS_TXT  = $(ARDUINO_DIR)/hardware/arduino/boards.txt
+BOARDS_TXT  = $(ARDUINO_DIR)/hardware/arduino/avr/boards.txt
 endif

 ifndef PARSE_BOARD
diff --git a/bin/ard-parse-boards b/bin/ard-parse-boards
index e2de71b..00ecb0a 100755
--- a/bin/ard-parse-boards
+++ b/bin/ard-parse-boards
@@ -9,7 +9,7 @@ use YAML;

 my %Opt = 
   (
-   boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt',
+   boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/avr/boards.txt',
   );

 GetOptions(\%Opt,

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      0