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

Use direct path to LDScript

Browse Source
This commit is contained in:
Ivan Kravets
2015-06-04 21:24:19 +03:00
parent 02d4efcfb5
commit 8c331df105
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@@ -1,6 +1,11 @@
Release History Release History
=============== ===============
2.1.1 (2015-??-??)
------------------
*
2.1.0 (2015-06-03) 2.1.0 (2015-06-03)
------------------ ------------------

2
platformio/__init__.py
View File

@@ -1,7 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
VERSION = (2, 1, 0) VERSION = (2, 1, "1.dev0")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

10
platformio/builder/main.py
View File

@@ -11,7 +11,7 @@ except ImportError:
break break
from platformio import util from platformio import util
from os.path import join from os.path import isfile, join
from time import time from time import time
from SCons.Script import (DefaultEnvironment, Exit, SConscript, from SCons.Script import (DefaultEnvironment, Exit, SConscript,
@@ -97,9 +97,11 @@ if "BOARD" in env:
UPLOAD_SPEED="${BOARD_OPTIONS['upload'].get('speed', None)}") UPLOAD_SPEED="${BOARD_OPTIONS['upload'].get('speed', None)}")
if "ldscript" in env.get("BOARD_OPTIONS", {}).get("build", {}): if "ldscript" in env.get("BOARD_OPTIONS", {}).get("build", {}):
env.Replace( env.Replace(
LDSCRIPT_PATH=join( LDSCRIPT_PATH=(
"$PIOHOME_DIR", "packages", "ldscripts", env['BOARD_OPTIONS']['build']['ldscript']
"${BOARD_OPTIONS['build']['ldscript']}" if isfile(env['BOARD_OPTIONS']['build']['ldscript'])
else join("$PIOHOME_DIR", "packages", "ldscripts",
"${BOARD_OPTIONS['build']['ldscript']}")
) )
) )