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

Repository for LD scripts; common LD script for ESP8266 // Resolve #379

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-17 18:17:54 +02:00
parent f0abd353ae
commit 3cbbecb413
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@ -7,6 +7,10 @@ PlatformIO 2.0
2.6.1 (2015-12-??) 2.6.1 (2015-12-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Created public `platformio-pkg-ldscripts <https://github.com/platformio/platformio-pkg-ldscripts.git>`_
repository for LD scripts. Moved common configuration for ESP8266 MCU to
``esp8266.flash.common.ld``
(`issue #379 <https://github.com/platformio/platformio/issues/379>`_)
* Fixed reset method for Espressif NodeMCU (ESP-12E Module) * Fixed reset method for Espressif NodeMCU (ESP-12E Module)
(`issue #380 <https://github.com/platformio/platformio/issues/380>`_) (`issue #380 <https://github.com/platformio/platformio/issues/380>`_)

2
platformio/__init__.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION = (2, 6, "1.dev0") VERSION = (2, 6, "1.dev1")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

1
platformio/builder/main.py
View File

@ -114,6 +114,7 @@ DefaultEnvironment(
) )
env = DefaultEnvironment() env = DefaultEnvironment()
env.Prepend(LIBPATH=[join("$PIOPACKAGES_DIR", "ldscripts")])
if "BOARD" in env: if "BOARD" in env:
try: try:

8
platformio/builder/tools/platformio.py
View File

@ -78,7 +78,9 @@ def BuildProgram(env):
env.Append( env.Append(
CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format( CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
*pioversion_to_intstr())] *pioversion_to_intstr())],
LIBS=deplibs,
LIBPATH=["$BUILD_DIR"]
) )
return env.Program( return env.Program(
@ -86,9 +88,7 @@ def BuildProgram(env):
env.LookupSources( env.LookupSources(
"$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False, "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
src_filter=getenv("PLATFORMIO_SRC_FILTER", src_filter=getenv("PLATFORMIO_SRC_FILTER",
env.get("SRC_FILTER"))), env.get("SRC_FILTER")))
LIBS=env.get("LIBS", []) + deplibs,
LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"]
) )