Skip to content

Commit

Permalink
New lib_archive option to control library archiving and linking behav…
Browse files Browse the repository at this point in the history
…iour // Resolve #993
  • Loading branch information
ivankravets committed Aug 1, 2017
1 parent b929e45 commit 7f63928
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ PlatformIO 3.0

* Pre/Post extra scripting for advanced control of PIO Build System
(`issue #891 <https://github.com/platformio/platformio-core/issues/891>`_)
* New `lib_archive <http://docs.platformio.org/page/projectconf/section_env_library.html#lib-archive>`_
option to control library archiving and linking behaviour
(`issue #993 <https://github.com/platformio/platformio-core/issues/993>`_)
* Add "inc" folder automatically to CPPPATH when "src" is available (works for project and library)
(`issue #1003 <https://github.com/platformio/platformio-core/issues/1003>`_)
* Use a root of library when filtering source code using
Expand Down
2 changes: 1 addition & 1 deletion docs
1 change: 1 addition & 0 deletions platformio/builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
("LIB_DEPS",),
("LIB_IGNORE",),
("LIB_EXTRA_DIRS",),
("LIB_ARCHIVE",),

# board options
("BOARD",),
Expand Down
2 changes: 1 addition & 1 deletion platformio/builder/tools/piolib.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def extra_script(self):

@property
def lib_archive(self):
return True
return self.env.get("LIB_ARCHIVE", "") != "false"

@staticmethod
def validate_ldf_mode(mode):
Expand Down
10 changes: 5 additions & 5 deletions platformio/commands/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ class EnvironmentProcessor(object):
"upload_protocol", "upload_speed", "upload_flags",
"upload_resetmethod", "lib_deps", "lib_ignore",
"lib_extra_dirs", "lib_ldf_mode", "lib_compat_mode",
"piotest", "test_transport", "test_ignore", "test_port",
"debug_tool", "debug_port", "debug_init_cmds",
"debug_extra_cmds", "debug_server", "debug_init_break",
"debug_load_cmd", "monitor_port", "monitor_baud",
"monitor_rts", "monitor_dtr")
"lib_archive", "piotest", "test_transport", "test_ignore",
"test_port", "debug_tool", "debug_port",
"debug_init_cmds", "debug_extra_cmds", "debug_server",
"debug_init_break", "debug_load_cmd", "monitor_port",
"monitor_baud", "monitor_rts", "monitor_dtr")

IGNORE_BUILD_OPTIONS = ("test_transport", "test_filter", "test_ignore",
"test_port", "debug_tool", "debug_port",
Expand Down

0 comments on commit 7f63928

Please sign in to comment.