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

Use current Python interpreter for Python-based tools // Resolve #417

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-30 20:01:43 +02:00
parent d139225ffb
commit 8d6aee3178
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@ -10,7 +10,7 @@ PlatformIO 2.0
* Moved SCons to PlatformIO packages. PlatformIO does not require SCons to be * Moved SCons to PlatformIO packages. PlatformIO does not require SCons to be
installed in your system. Significantly simplified installation process of installed in your system. Significantly simplified installation process of
PlatformIO. ``pip install platformio`` rocks! PlatformIO. ``pip install platformio`` rocks!
* Implemented uploading files to file system SPIFFS for ESP8266 * Implemented uploading files to file system of ESP8266 SPIFFS (including OTA)
(`issue #382 <https://github.com/platformio/platformio/issues/382>`_) (`issue #382 <https://github.com/platformio/platformio/issues/382>`_)
* Added support for the new Adafruit boards Bluefruit Micro and Feather * Added support for the new Adafruit boards Bluefruit Micro and Feather
(`issue #403 <https://github.com/platformio/platformio/issues/403>`_) (`issue #403 <https://github.com/platformio/platformio/issues/403>`_)
@ -23,6 +23,8 @@ PlatformIO 2.0
* Documented `firmware uploading for Atmel AVR development platform using * Documented `firmware uploading for Atmel AVR development platform using
Programmers <http://docs.platformio.org/en/latest/platforms/atmelavr.html#upload-using-programmer>`_: Programmers <http://docs.platformio.org/en/latest/platforms/atmelavr.html#upload-using-programmer>`_:
AVR ISP, AVRISP mkII, USBtinyISP, USBasp, Parallel Programmer and Arduino as ISP AVR ISP, AVRISP mkII, USBtinyISP, USBasp, Parallel Programmer and Arduino as ISP
* Fixed issue with current Python interpreter for Python-based tools
(`pull #417 <https://github.com/platformio/platformio/pull/417>`_)
2.6.3 (2015-12-21) 2.6.3 (2015-12-21)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (2, 7, "0.dev14") VERSION = (2, 7, "0.dev15")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

7
platformio/builder/main.py
View File

@ -13,8 +13,9 @@
# limitations under the License. # limitations under the License.
import json import json
import sys
from os import environ from os import environ
from os.path import join from os.path import join, normpath
from time import time from time import time
from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment, Variables from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment, Variables
@ -88,7 +89,9 @@ DefaultEnvironment(
"$PROJECTLIB_DIR", "$PROJECTLIB_DIR",
util.get_lib_dir(), util.get_lib_dir(),
join("$PLATFORMFW_DIR", "libraries") join("$PLATFORMFW_DIR", "libraries")
] ],
PYTHONEXE=normpath(sys.executable)
) )
env = DefaultEnvironment() env = DefaultEnvironment()

4
platformio/builder/scripts/espressif.py
View File

@ -115,12 +115,12 @@ env.Replace(
UPLOADEROTAFLAGS=[ UPLOADEROTAFLAGS=[
"--debug", "--debug",
"--progress", "--progress",
"-i", '"$UPLOAD_PORT"', "-i", "$UPLOAD_PORT",
"$UPLOAD_FLAGS" "$UPLOAD_FLAGS"
], ],
UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -cf $SOURCE', UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -cf $SOURCE',
UPLOADOTACMD='"$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE', UPLOADOTACMD='"$PYTHONEXE" "$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
# #
# Misc # Misc