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

Code improvements

Browse Source
This commit is contained in:
Ivan Kravets
2016-04-23 23:21:01 +03:00
parent 9ff22f802a
commit 0fdccddd88
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformio/builder/scripts/frameworks/arduino.py
View File

@ -253,8 +253,7 @@ envsafe = env.Clone()
if BOARD_BUILDOPTS.get("core", None) == "teensy3": if BOARD_BUILDOPTS.get("core", None) == "teensy3":
libs.append("arm_cortex%sl_math" % ( libs.append("arm_cortex%sl_math" % (
"M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0") "M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0"))
)
libs.append(envsafe.BuildLibrary( libs.append(envsafe.BuildLibrary(

26
platformio/builder/scripts/frameworks/mbed.py
View File

@ -196,27 +196,27 @@ def get_build_flags(data):
return flags return flags
def _mbed_whole_archive_hook(libs): def _mbed_whole_archive_hook(libs_):
if (not isinstance(libs, list) or if (not isinstance(libs_, list) or
env.get("BOARD_OPTIONS", {}).get("platform") != "ststm32"): env.get("BOARD_OPTIONS", {}).get("platform") != "ststm32"):
return libs return libs_
_dynlibs = [] _dynlibs = []
_stlibs = [] _stlibs = []
for l in libs: for l_ in libs_:
if isinstance(l, basestring): if isinstance(l_, basestring):
_stlibs.append(l) _stlibs.append(l_)
else: else:
_dynlibs.append(l) _dynlibs.append(l_)
libs = [] libs_ = []
if _dynlibs: if _dynlibs:
libs.append("-Wl,-whole-archive") libs_.append("-Wl,-whole-archive")
libs.extend(_dynlibs) libs_.extend(_dynlibs)
libs.append("-Wl,-no-whole-archive") libs_.append("-Wl,-no-whole-archive")
libs.extend(_stlibs) libs_.extend(_stlibs)
return libs return libs_
board_type = env.subst("$BOARD") board_type = env.subst("$BOARD")

3
platformio/commands/upgrade.py
View File

@ -94,9 +94,6 @@ WARNING! Don't use `sudo` for the rest PlatformIO commands.
else: else:
raise exception.UpgradeError( raise exception.UpgradeError(
"\n".join([str(cmd), r['out'], r['err']])) "\n".join([str(cmd), r['out'], r['err']]))
finally:
if r:
r.close()
def get_latest_version(): def get_latest_version():

6
platformio/util.py
View File

@ -125,8 +125,8 @@ def singleton(cls):
def load_json(file_path): def load_json(file_path):
with open(file_path, "r") as f: with open(file_path, "r") as f:
return json.load(f) return json.load(f)
def get_systype(): def get_systype():
@ -170,7 +170,7 @@ def get_home_dir():
try: try:
home_dir.encode("utf8") home_dir.encode("utf8")
except UnicodeDecodeError: except UnicodeDecodeError:
home_dir = splitdrive(home_dir)[0] + "\.platformio" home_dir = splitdrive(home_dir)[0] + "\\.platformio"
if not isdir(home_dir): if not isdir(home_dir):
os.makedirs(home_dir) os.makedirs(home_dir)