From 34bd837ff1cfbd8890492c6f365a49e530a440de Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 26 Nov 2018 13:25:26 +0100
Subject: [PATCH] Rename extra_libraries to libraries

---
 esphomeyaml/const.py       | 2 +-
 esphomeyaml/core_config.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphomeyaml/const.py b/esphomeyaml/const.py
index a769a128da..71ef6751b9 100644
--- a/esphomeyaml/const.py
+++ b/esphomeyaml/const.py
@@ -377,7 +377,7 @@ CONF_OUTPUTS = 'outputs'
 CONF_SWITCHES = 'switches'
 CONF_TEXT_SENSORS = 'text_sensors'
 CONF_INCLUDES = 'includes'
-CONF_EXTRA_LIBRARIES = 'extra_libraries'
+CONF_LIBRARIES = 'libraries'
 
 ALLOWED_NAME_CHARS = u'abcdefghijklmnopqrstuvwxyz0123456789_'
 ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git#feature/stage'
diff --git a/esphomeyaml/core_config.py b/esphomeyaml/core_config.py
index f0979f0d82..38eec55403 100644
--- a/esphomeyaml/core_config.py
+++ b/esphomeyaml/core_config.py
@@ -11,7 +11,7 @@ from esphomeyaml.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266
     CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, CONF_LOCAL, CONF_NAME, CONF_ON_BOOT, \
     CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, CONF_PRIORITY, CONF_REPOSITORY, CONF_TAG, \
     CONF_TRIGGER_ID, CONF_USE_CUSTOM_CODE, ESPHOMELIB_VERSION, ESP_PLATFORM_ESP32, \
-    ESP_PLATFORM_ESP8266, CONF_EXTRA_LIBRARIES, CONF_INCLUDES
+    ESP_PLATFORM_ESP8266, CONF_LIBRARIES, CONF_INCLUDES
 from esphomeyaml.core import CORE, EsphomeyamlError
 from esphomeyaml.cpp_generator import Pvariable, RawExpression, add
 from esphomeyaml.cpp_types import App, NoArg, const_char_ptr, esphomelib_ns
@@ -176,7 +176,7 @@ CONFIG_SCHEMA = vol.Schema({
         cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(LoopTrigger),
     }),
     vol.Optional(CONF_INCLUDES): vol.All(cv.ensure_list, [cv.file_]),
-    vol.Optional(CONF_EXTRA_LIBRARIES): vol.All(cv.ensure_list, [cv.string_strict]),
+    vol.Optional(CONF_LIBRARIES): vol.All(cv.ensure_list, [cv.string_strict]),
 
     vol.Optional('library_uri'): cv.invalid("The library_uri option has been removed in 1.8.0 and "
                                             "was moved into the esphomelib_version option."),
@@ -227,7 +227,7 @@ def to_code(config):
 
 
 def lib_deps(config):
-    return set(config.get(CONF_EXTRA_LIBRARIES, []))
+    return set(config.get(CONF_LIBRARIES, []))
 
 
 def includes(config):
@@ -235,5 +235,5 @@ def includes(config):
     for include in config.get(CONF_INCLUDES, []):
         path = CORE.relative_path(include)
         res = os.path.relpath(path, CORE.relative_build_path('src', 'main.cpp'))
-        ret.append(res)
+        ret.append(u'#include "{}"'.format(res))
     return ret