Improved system type detection

2014-07-31 16:20:31 +03:00
parent e81723f73c
commit 3bd1fe51ab
5 changed files with 13 additions and 14 deletions
@@ -12,7 +12,6 @@ from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default,

 from platformio.util import reset_serialport

-
 env = DefaultEnvironment()

 env.Replace(
@@ -7,13 +7,11 @@
 """

 from os.path import join
+from platform import system

 from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default,
                          DefaultEnvironment)

-from platformio.util import get_system
-
-
 env = DefaultEnvironment()

 env.Replace(
@@ -55,7 +53,7 @@ env.Replace(

    UPLOADER=join("$PLATFORMTOOLS_DIR", "mspdebug", "mspdebug"),
    UPLOADERFLAGS=[
-        "$UPLOAD_PROTOCOL" if get_system() != "windows32" else "tilib",
+        "$UPLOAD_PROTOCOL" if system() != "Windows" else "tilib",
        "--force-reset"
    ],
    UPLOADCMD='$UPLOADER $UPLOADERFLAGS "prog $SOURCES"'
@@ -11,7 +11,6 @@ from os.path import join
 from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default,
                          DefaultEnvironment)

-
 env = DefaultEnvironment()

 env.Replace(