From d805fb4e1fa624ec1c4731e68bc51c654720fdcc Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 24 Apr 2015 09:06:30 +0200
Subject: [PATCH] Renamed compiler.warning_flags pref to compiler.warning_level
 Provided a default value for compiler.warning_flags Releasing avr core 1.6.5

---
 app/src/processing/app/Preferences.java       |  4 +-
 .../src/processing/app/debug/Compiler.java    |  4 +-
 build/shared/bundled_package_index.json       | 46 +++++++++++++++++++
 hardware/arduino/avr/platform.txt             |  3 +-
 hardware/arduino/sam/platform.txt             |  1 +
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 88d8545f9..23230b36d 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -379,7 +379,7 @@ public class Preferences {
     box.add(label);
     WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("None")), new WarningItem("default", _("Default")), new WarningItem("more", _("More")), new WarningItem("all", _("All")), };
     comboWarnings = new JComboBox(warningItems);
-    String currentWarningLevel = PreferencesData.get("compiler.warning_flags", "none");
+    String currentWarningLevel = PreferencesData.get("compiler.warning_level", "none");
     for (WarningItem item : warningItems) {
       if (currentWarningLevel.equals(item.getValue())) {
         comboWarnings.setSelectedItem(item);
@@ -771,7 +771,7 @@ public class Preferences {
     PreferencesData.set("editor.languages.current", newLanguage.isoCode);
 
     WarningItem warningItem = (WarningItem) comboWarnings.getSelectedItem();
-    PreferencesData.set("compiler.warning_flags", warningItem.getValue());
+    PreferencesData.set("compiler.warning_level", warningItem.getValue());
 
     Preferences.set("proxy.http.server", proxyHTTPServer.getText());
     try {
diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java
index 9825b0fda..83af66470 100644
--- a/arduino-core/src/processing/app/debug/Compiler.java
+++ b/arduino-core/src/processing/app/debug/Compiler.java
@@ -903,8 +903,8 @@ public class Compiler implements MessageConsumer {
   }
 
   private void setupWarningFlags(PreferencesMap dict) {
-    if (dict.containsKey("compiler.warning_flags")) {
-      String key = "compiler.warning_flags." + dict.get("compiler.warning_flags");
+    if (dict.containsKey("compiler.warning_level")) {
+      String key = "compiler.warning_flags." + dict.get("compiler.warning_level");
       dict.put("compiler.warning_flags", dict.get(key));
     } else {
       dict.put("compiler.warning_flags", dict.get("compiler.warning_flags.none"));
diff --git a/build/shared/bundled_package_index.json b/build/shared/bundled_package_index.json
index 9dd8d7c0a..8cce1ceee 100644
--- a/build/shared/bundled_package_index.json
+++ b/build/shared/bundled_package_index.json
@@ -144,6 +144,52 @@
             }
           ]
         },
+        {
+          "name": "Arduino AVR Boards",
+          "architecture": "avr",
+          "version": "1.6.5",
+          "category": "Arduino",
+          "help": {
+            "online": "http://arduino.cc/en/Reference/HomePage"
+          },
+          "url": "http://downloads.arduino.cc/cores/avr-1.6.5.tar.bz2",
+          "archiveFileName": "avr-1.6.5.tar.bz2",
+          "checksum": "SHA-256:c72d890aa605add677634c6b25ebc3b2ed9e44c38805b95c47eab17a1ca72db6",
+          "size": "4876957",
+          "boards": [
+            {"name": "Arduino Yún"},
+            {"name": "Arduino Uno"},
+            {"name": "Arduino Diecimila"},
+            {"name": "Arduino Nano"},
+            {"name": "Arduino Mega"},
+            {"name": "Arduino MegaADK"},
+            {"name": "Arduino Leonardo"},
+            {"name": "Arduino Micro"},
+            {"name": "Arduino Esplora"},
+            {"name": "Arduino Mini"},
+            {"name": "Arduino Ethernet"},
+            {"name": "Arduino Fio"},
+            {"name": "Arduino BT"},
+            {"name": "Arduino LilyPadUSB"},
+            {"name": "Arduino Lilypad"},
+            {"name": "Arduino Pro"},
+            {"name": "Arduino ATMegaNG"},
+            {"name": "Arduino Robot Control"},
+            {"name": "Arduino Robot Motor"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "avr-gcc",
+              "version": "4.8.1-arduino5"
+            },
+            {
+              "packager": "arduino",
+              "name": "avrdude",
+              "version": "6.0.1-arduino5"
+            }
+          ]
+        },
         {
           "name": "Arduino SAM Boards (32-bits ARM Cortex-M3)",
           "architecture": "sam",
diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 46ab40420..5f26eb536 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -6,11 +6,12 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Arduino AVR Boards
-version=1.6.4
+version=1.6.5
 
 # AVR compile variables
 # --------------------- 
 
+compiler.warning_flags=-w
 compiler.warning_flags.none=-w
 compiler.warning_flags.default=
 compiler.warning_flags.more=-Wall
diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt
index b7978fbd6..2f157a30d 100644
--- a/hardware/arduino/sam/platform.txt
+++ b/hardware/arduino/sam/platform.txt
@@ -11,6 +11,7 @@ version=1.6.3
 # SAM3 compile variables
 # ----------------------
 
+compiler.warning_flags=-w
 compiler.warning_flags.none=-w
 compiler.warning_flags.default=
 compiler.warning_flags.more=-Wall