Merge branch 'develop' of https://github.com/ivankravets/platformio into develop

2015-02-03 14:04:29 +02:00
parent 2227267ff6 c05418f47e
commit 85afbdb8a7
7 changed files with 19 additions and 9 deletions
@@ -26,6 +26,7 @@ env.Replace(
    ARFLAGS=["rcs"],

    ASFLAGS=[
+        "-c",
        "-g",  # include debugging info (so errors include line numbers)
        "-x", "assembler-with-cpp",
        "-mmcu=$BOARD_MCU"
@@ -62,13 +63,14 @@ env.Replace(
        "-q",  # suppress progress output
        "-D",  # disable auto erase for flash memory
        "-p", "$BOARD_MCU",
-        "-C", join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude.conf"),
+        "-C", '"%s"' % join("$PIOPACKAGES_DIR",
+                            "tool-avrdude", "avrdude.conf"),
        "-c", "$UPLOAD_PROTOCOL",
        "-b", "$UPLOAD_SPEED",
        "-P", "$UPLOAD_PORT"
    ],
-    UPLOADHEXCMD="$UPLOADER $UPLOADERFLAGS -U flash:w:$SOURCES:i",
-    UPLOADEEPCMD="$UPLOADER $UPLOADERFLAGS -U eeprom:w:$SOURCES:i"
+    UPLOADHEXCMD='"$UPLOADER" $UPLOADERFLAGS -U flash:w:$SOURCES:i',
+    UPLOADEEPCMD='"$UPLOADER" $UPLOADERFLAGS -U eeprom:w:$SOURCES:i'
 )

 env.Append(
@@ -56,4 +56,4 @@ libs.append(env.BuildLibrary(
    join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 ))

-Return("libs")
+Return("env libs")
@@ -44,4 +44,4 @@ libs.append(env.BuildLibrary(
    join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 ))

-Return("libs")
+Return("env libs")
@@ -25,6 +25,7 @@ env.Replace(
    ARFLAGS=["rcs"],

    ASFLAGS=[
+        "-c",
        "-g",  # include debugging info (so errors include line numbers)
        "-x", "-assembler-with-cpp",
        "-mmcu=$BOARD_MCU"
@@ -24,6 +24,7 @@ env.Replace(
    ARFLAGS=["rcs"],

    ASFLAGS=[
+        "-c",
        "-g",  # include debugging info (so errors include line numbers)
        "-x", "assembler-with-cpp",
        "-Wall",