Skip to content

Commit

Permalink
Merge branch 'hotfix/v4.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Apr 19, 2019
2 parents 7145592 + 6490b6b commit d346496
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ environment:

install:
- cmd: git submodule update --init --recursive
- cmd: SET PATH=%PATH%;C:\Python27\Scripts
- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
- cmd: platformio platform install file://.

test_script:
Expand Down
5 changes: 3 additions & 2 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
http://arduino.cc/en/Reference/HomePage
"""

from io import open
from os import listdir
from os.path import isdir, isfile, join

Expand Down Expand Up @@ -270,14 +271,14 @@
continue
content = None
content_changed = False
with open(file_path) as fp:
with open(file_path, encoding="latin-1") as fp:
content = fp.read()
if '#include "../' in content:
content_changed = True
content = content.replace('#include "../', '#include "')
if not content_changed:
continue
with open(file_path, "w") as fp:
with open(file_path, "w", encoding="latin-1") as fp:
fp.write(content)
else:
env.Prepend(LIBPATH=[join(FRAMEWORK_DIR, "cores", "teensy3")])
Expand Down
2 changes: 1 addition & 1 deletion platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-teensy.git"
},
"version": "4.2.0",
"version": "4.2.1",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json"
Expand Down

0 comments on commit d346496

Please sign in to comment.