feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Normalize SVD path

Browse Source
This commit is contained in:
Ivan Kravets
2018-04-30 12:33:19 +03:00
parent b1caaa2208
commit c9fa2206ef
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platformio/builder/tools/pioide.py
View File

@ -16,7 +16,7 @@ from __future__ import absolute_import
from glob import glob from glob import glob
from os import environ from os import environ
from os.path import abspath, dirname, join from os.path import abspath, isfile, join
from SCons.Defaults import processDefines from SCons.Defaults import processDefines
@ -112,12 +112,17 @@ def _get_svd_path(env):
return None return None
try: try:
svd_path = env.BoardConfig().get("debug.svd_path") svd_path = env.BoardConfig().get("debug.svd_path")
except KeyError: assert svd_path
except (AssertionError, KeyError):
return None return None
if not svd_path: # custom path to SVD file
return None if isfile(svd_path):
with util.cd(dirname(env.BoardConfig().manifest_path)): return svd_path
return abspath(svd_path) # default file from ./platform/misc/svd folder
p = env.PioPlatform()
if isfile(join(p.get_dir(), "misc", "svd", svd_path)):
return abspath(join(p.get_dir(), "misc", "svd", svd_path))
return None
def DumpIDEData(env): def DumpIDEData(env):