From 3bcc3e07aec7b9a15c6d095a81faf3f99f92e6b5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 25 Apr 2018 17:15:40 +0300 Subject: [PATCH] Respect a custom "lib_dir" option in platformio.ini // Resolve #1473 --- HISTORY.rst | 2 ++ platformio/commands/init.py | 15 ++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 01be6c6c..0497745e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -19,6 +19,8 @@ PlatformIO 3.0 `PlatformIO Home `_) * Updated Unity tool to 2.4.3 * Improved support for Black Magic Probe in "uploader" role +* Respect a custom "lib_dir" option in `Project Configuration File "platformio.ini" `__ + (`issue #1473 `_) * Fixed issue with useless project rebuilding for case insensitive file systems (Windows) * Fixed issue with ``build_unflags`` option when a macro contains value diff --git a/platformio/commands/init.py b/platformio/commands/init.py index f343052d..e7151287 100644 --- a/platformio/commands/init.py +++ b/platformio/commands/init.py @@ -139,15 +139,12 @@ def init_base_project(project_dir): join(util.get_source_dir(), "projectconftpl.ini"), join(project_dir, "platformio.ini")) - lib_dir = join(project_dir, "lib") - src_dir = join(project_dir, "src") - config = util.load_project_config(project_dir) - if config.has_option("platformio", "src_dir"): - src_dir = join(project_dir, config.get("platformio", "src_dir")) - - for d in (src_dir, lib_dir): - if not isdir(d): - makedirs(d) + with util.cd(project_dir): + lib_dir = util.get_projectlib_dir() + src_dir = util.get_projectsrc_dir() + for d in (src_dir, lib_dir): + if not isdir(d): + makedirs(d) init_lib_readme(lib_dir) init_ci_conf(project_dir)