platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v3.5.5' into develop

Browse Source 
* hotfix/v3.5.5:
  Fixed an issue with PIO Remote  when upload process depends on the source code of a project framework
This commit is contained in:
Ivan Kravets
2018-07-30 14:26:35 +03:00
parent 9a5f9843b9 ae964fa729
commit 41432d4075
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@ -31,6 +31,8 @@ PlatformIO 3.0
- Force building of project source code using `test_build_project_src <http://docs.platformio.org/page/projectconf/section_env_test.html#test_build_project_src>`__ option - Force building of project source code using `test_build_project_src <http://docs.platformio.org/page/projectconf/section_env_test.html#test_build_project_src>`__ option
- Fixed missed ``UNIT_TEST`` macro for unit test components/libraries - Fixed missed ``UNIT_TEST`` macro for unit test components/libraries
* Fixed an issue with `PIO Remote <http://docs.platformio.org/page/plus/pio-remote.html>`__
when upload process depends on the source code of a project framework
* Fixed an issue when ``srcFilter`` field in `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__ * Fixed an issue when ``srcFilter`` field in `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__
breaks a library build breaks a library build
(`issue #1735 <https://github.com/platformio/platformio-core/issues/1735>`_) (`issue #1735 <https://github.com/platformio/platformio-core/issues/1735>`_)

3
platformio/builder/tools/platformio.py
View File

@ -307,7 +307,8 @@ def BuildFrameworks(env, frameworks):
if f in ("arduino", "energia"): if f in ("arduino", "energia"):
# Arduino IDE appends .o the end of filename # Arduino IDE appends .o the end of filename
Builder.match_splitext = scons_patched_match_splitext Builder.match_splitext = scons_patched_match_splitext
env.ConvertInoToCpp() if "nobuild" not in COMMAND_LINE_TARGETS:
env.ConvertInoToCpp()
if f in board_frameworks: if f in board_frameworks:
SConscript(env.GetFrameworkScript(f), exports="env") SConscript(env.GetFrameworkScript(f), exports="env")

13
platformio/managers/platform.py
View File

@ -604,12 +604,13 @@ class PlatformBase( # pylint: disable=too-many-public-methods
# enable upload tools for upload targets # enable upload tools for upload targets
if any(["upload" in t for t in targets] + ["program" in targets]): if any(["upload" in t for t in targets] + ["program" in targets]):
for _name, _opts in self.packages.iteritems(): for name, opts in self.packages.iteritems():
if _opts.get("type") == "uploader": if opts.get("type") == "uploader":
self.packages[_name]['optional'] = False self.packages[name]['optional'] = False
elif "nobuild" in targets: # skip all packages in "nobuild" mode
# skip all packages, allow only upload tools # allow only upload tools and frameworks
self.packages[_name]['optional'] = True elif "nobuild" in targets and opts.get("type") != "framework":
self.packages[name]['optional'] = True
def get_lib_storages(self): def get_lib_storages(self):
storages = [] storages = []