Merge branch 'release/v1.5.2'

Author: ivankravets

builder/main.py

@@ -69,6 +69,9 @@
 
     LIBS=["m"],
 
+    SIZEPROGREGEXP=r"^(?:\.reset|\.image_ptr_table|\.app_excpt|\.vector\S*|\.startup|\.init|\.fini|\.ctors|\.dtors|\.header_info|\.dinit|\.text\S*|\.rodata\S*|\.data)\s+([0-9]+).*",
+    SIZEDATAREGEXP=r"^(?:\.ram_exchange_data|\.dbg_data|\.sdata|\.sbss|\.data\S*|\.stack|\.bss|\.comment.__use_force_isr_install|\.eh_frame|\.jcr)\s+([0-9]+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
     UPLOADER="pic32prog",
@@ -91,6 +94,10 @@
         CCFLAGS=["-G1024"]
     )
 
+# append LD script manually
+if "LDSCRIPT_PATH" in env:
+    del env['LDSCRIPT_PATH']
+
 
 env.Append(
     BUILDERS=dict(
@@ -129,16 +136,8 @@
 else:
     target_elf = env.BuildProgram()
 
-    # Hook: Fix option for LD script
-    _new_linkflags = []
-    for f in env['LINKFLAGS']:
-        if not f.startswith("-Wl,-T"):
-            _new_linkflags.append(f)
-        else:
-            _new_linkflags.append("-Wl,--script=%s" % f[6:])
-
-    env.Replace(LINKFLAGS=_new_linkflags)
     env.Append(LINKFLAGS=[
+        "-Wl,--script=%s" % env.BoardConfig().get("build.ldscript", ""),
         "-Wl,--script=chipKIT-application-COMMON%s.ld" %
         ("-MZ" if "MZ" in env.BoardConfig().get("build.mcu", "") else "")
     ])

examples/arduino-blink/platformio.ini

@@ -37,7 +37,7 @@ board = chipkit_pro_mx7
 ;framework = arduino
 ;board = chipkit_pi
 
-[env:chipkit_cmod]
+[env:chipkit cmod]
 platform = microchippic32
 framework = arduino
 board = chipkit_cmod

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-microchippic32.git"
   },
-  "version": "1.5.1",
+  "version": "1.5.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"