From fc7430de945a7535a35c8e45dee95b1b69bd91f8 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jun 2014 20:59:02 +0300 Subject: [PATCH] Cleaned code --- platformio/__main__.py | 3 +-- platformio/builder/main.py | 1 - platformio/builder/scripts/atmelavr.py | 9 --------- platformio/builder/scripts/frameworks/arduino.py | 1 - platformio/builder/scripts/frameworks/energia.py | 1 - platformio/builder/scripts/timsp430.py | 6 ------ platformio/builder/scripts/titiva.py | 7 ------- platformio/util.py | 6 +++--- 8 files changed, 4 insertions(+), 30 deletions(-) diff --git a/platformio/__main__.py b/platformio/__main__.py index a144528c..f114362d 100644 --- a/platformio/__main__.py +++ b/platformio/__main__.py @@ -1,12 +1,11 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -import click from sys import exit +import click from clint.textui import colored, indent, puts - from platformio.util import get_project_config, run_builder diff --git a/platformio/builder/main.py b/platformio/builder/main.py index 8b5565c5..da9254e4 100644 --- a/platformio/builder/main.py +++ b/platformio/builder/main.py @@ -8,7 +8,6 @@ from SCons.Script import (DefaultEnvironment, Exit, SConscript, from platformio.util import get_home_dir, get_project_dir, get_source_dir - # AllowSubstExceptions() # allow common variables from INI file diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py index cd2492c1..7aaa69c9 100644 --- a/platformio/builder/scripts/atmelavr.py +++ b/platformio/builder/scripts/atmelavr.py @@ -11,7 +11,6 @@ from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default, DefaultEnvironment, Exit, SConscript, SConscriptChdir) - env = DefaultEnvironment() env.Replace( @@ -100,10 +99,8 @@ env.PrependENVPath( join(env.subst("$PLATFORMTOOLS_DIR"), "toolchain", "bin") ) - BUILT_LIBS = [] - # # Process framework script # @@ -115,28 +112,24 @@ if "FRAMEWORK" in env: exports="env") BUILT_LIBS += flibs - # # Target: Build executable and linkable firmware # target_elf = env.BuildFirmware(BUILT_LIBS + ["m"]) - # # Target: Extract EEPROM data (from EEMEM directive) to .eep file # target_eep = env.ElfToEep(join("$BUILD_DIR", "firmware"), target_elf) - # # Target: Build the .hex file # target_hex = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) - # # Target: Upload .eep file # @@ -145,7 +138,6 @@ eep = env.Alias("eep", target_eep, [ lambda target, source, env: env.ResetDevice(), "$UPLOADEEPCMD"]) AlwaysBuild(eep) - # # Target: Upload .hex file # @@ -154,7 +146,6 @@ upload = env.Alias("upload", target_hex, [ lambda target, source, env: env.ResetDevice(), "$UPLOADHEXCMD"]) AlwaysBuild(upload) - # # Target: Define targets # diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index 6483cfbe..fc7b6bbd 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -9,7 +9,6 @@ from os.path import join from SCons.Script import Import, Return - env = None Import("env") diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py index 9662006f..f69bed88 100644 --- a/platformio/builder/scripts/frameworks/energia.py +++ b/platformio/builder/scripts/frameworks/energia.py @@ -9,7 +9,6 @@ from os.path import join from SCons.Script import Import, Return - env = None Import("env") diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py index 25299fa1..f31745b8 100644 --- a/platformio/builder/scripts/timsp430.py +++ b/platformio/builder/scripts/timsp430.py @@ -11,7 +11,6 @@ from os.path import join from SCons.Script import (AlwaysBuild, Builder, Default, DefaultEnvironment, SConscript, SConscriptChdir) - env = DefaultEnvironment() env.Replace( @@ -77,10 +76,8 @@ env.PrependENVPath( join(env.subst("$PLATFORMTOOLS_DIR"), "toolchain", "bin") ) - BUILT_LIBS = [] - # # Process framework script # @@ -99,14 +96,12 @@ if "FRAMEWORK" in env: target_elf = env.BuildFirmware(BUILT_LIBS + ["m"]) - # # Target: Build the .hex # target_hex = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) - # # Target: Upload firmware # @@ -114,7 +109,6 @@ target_hex = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) upload = env.Alias("upload", target_hex, ["$UPLOADCMD"]) AlwaysBuild(upload) - # # Target: Define targets # diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py index 73d9504c..0d0d6c9a 100644 --- a/platformio/builder/scripts/titiva.py +++ b/platformio/builder/scripts/titiva.py @@ -11,7 +11,6 @@ from os.path import join from SCons.Script import (AlwaysBuild, Builder, Default, DefaultEnvironment, SConscript, SConscriptChdir) - env = DefaultEnvironment() env.Replace( @@ -93,10 +92,8 @@ env.PrependENVPath( join(env.subst("$PLATFORMTOOLS_DIR"), "toolchain", "bin") ) - BUILT_LIBS = [] - # # Process framework script # @@ -108,21 +105,18 @@ if "FRAMEWORK" in env: exports="env") BUILT_LIBS += flibs - # # Target: Build executable and linkable firmware # target_elf = env.BuildFirmware(BUILT_LIBS + ["c", "gcc", "m"]) - # # Target: Build the .bin file # target_bin = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf) - # # Target: Upload firmware # @@ -130,7 +124,6 @@ target_bin = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf) upload = env.Alias("upload", target_bin, ["$UPLOADCMD"]) AlwaysBuild(upload) - # # Target: Define targets # diff --git a/platformio/util.py b/platformio/util.py index 8c20409f..1d9ceabc 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -1,10 +1,10 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -from sys import exit from os import getcwd -from os.path import dirname, expanduser, join, realpath, isfile -from subprocess import Popen, PIPE +from os.path import dirname, expanduser, isfile, join, realpath +from subprocess import PIPE, Popen +from sys import exit try: from configparser import ConfigParser