Rename "ignore_libs" env option to "lib_ignore"

This commit is contained in:
Ivan Kravets
2015-06-28 19:31:28 +03:00
parent a928f4aa8f
commit 776a2027fb
5 changed files with 11 additions and 10 deletions

View File

@ -297,7 +297,7 @@ Release History
commands which allows to return the output in `JSON <http://en.wikipedia.org/wiki/JSON>`_ format
(`issue #42 <https://github.com/platformio/platformio/issues/42>`_)
* Allowed to ignore some libs from *Library Dependency Finder* via
`ignore_libs <http://docs.platformio.org/en/latest/projectconf.html#ignore-libs>`_ option
`lib_ignore <http://docs.platformio.org/en/latest/projectconf.html#lib-ignore>`_ option
* Improved `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
command: asynchronous output for build process, timing and detailed
information about environment configuration

View File

@ -370,8 +370,8 @@ Example:
[env:libs_with_highest_priority]
use_libs = OneWire_ID1
``ignore_libs``
^^^^^^^^^^^^^^^
``lib_ignore``
^^^^^^^^^^^^^^
Specify libraries which should be ignored by ``Library Dependency Finder (LDF)``
@ -380,10 +380,10 @@ Example:
.. code-block:: ini
[env:ignore_some_libs]
ignore_libs = SPI,EngduinoV3_ID123
lib_ignore = SPI,EngduinoV3_ID123
``lib_dfcyclic``
^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^
Control cyclic (recursive) behaviour for ``Library Dependency Finder (LDF)``.
By default, this option is turned OFF (``lib_dfcyclic=False``) and means, that

View File

@ -40,7 +40,7 @@ commonvars.AddVariables(
("BUILD_FLAGS",),
("SRCBUILD_FLAGS",),
("SRC_FILTER",),
("IGNORE_LIBS",),
("LIB_IGNORE",),
("USE_LIBS",),
("LIB_DFCYCLIC",),
@ -118,8 +118,8 @@ if "BOARD" in env:
env.get("BOARD_OPTIONS", {}).get("platform")))
if "IGNORE_LIBS" in env:
env['IGNORE_LIBS'] = [l.strip() for l in env['IGNORE_LIBS'].split(",")]
if "LIB_IGNORE" in env:
env['LIB_IGNORE'] = [l.strip() for l in env['LIB_IGNORE'].split(",")]
env.PrependENVPath(
"PATH",

View File

@ -241,7 +241,7 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
lib_name = basename(lib_dir)
# ignore user's specified libs
if "IGNORE_LIBS" in env and lib_name in env['IGNORE_LIBS']:
if lib_name in env.get("LIB_IGNORE", []):
continue
if not isfile(inc_path):

View File

@ -74,7 +74,8 @@ def cli(ctx, environment, target, upload_port, # pylint: disable=R0913,R0914
class EnvironmentProcessor(object):
RENAMED_OPTIONS = {
"LDF_CYCLIC": "LIB_DFCYCLIC"
"LDF_CYCLIC": "LIB_DFCYCLIC",
"IGNORE_LIBS": "LIB_IGNORE"
}
def __init__(self, cmd_ctx, name, options, # pylint: disable=R0913