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

Improved system type detection

Browse Source
This commit is contained in:
Ivan Kravets
2014-07-31 16:20:31 +03:00
parent e81723f73c
commit 3bd1fe51ab
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platformio/builder/scripts/atmelavr.py
View File

@ -12,7 +12,6 @@ from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default,
from platformio.util import reset_serialport from platformio.util import reset_serialport
env = DefaultEnvironment() env = DefaultEnvironment()
env.Replace( env.Replace(

6
platformio/builder/scripts/timsp430.py
View File

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

1
platformio/builder/scripts/titiva.py
View File

@ -11,7 +11,6 @@ from os.path import join
from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default, from SCons.Script import (AlwaysBuild, Builder, COMMAND_LINE_TARGETS, Default,
DefaultEnvironment) DefaultEnvironment)
env = DefaultEnvironment() env = DefaultEnvironment()
env.Replace( env.Replace(

8
platformio/pkgmanager.py
View File

@ -14,7 +14,7 @@ from platformio.downloader import FileDownloader
from platformio.exception import (InvalidPackageVersion, NonSystemPackage, from platformio.exception import (InvalidPackageVersion, NonSystemPackage,
UnknownPackage) UnknownPackage)
from platformio.unpacker import FileUnpacker from platformio.unpacker import FileUnpacker
from platformio.util import get_home_dir, get_system from platformio.util import get_home_dir, get_systype
class PackageManager(object): class PackageManager(object):
@ -66,11 +66,11 @@ class PackageManager(object):
raise UnknownPackage(name) raise UnknownPackage(name)
# check system platform # check system platform
system = get_system() systype = get_systype()
builds = ([b for b in manifest[name] if b['system'] == "all" or system builds = ([b for b in manifest[name] if b['system'] == "all" or systype
in b['system']]) in b['system']])
if not builds: if not builds:
raise NonSystemPackage(name, system) raise NonSystemPackage(name, systype)
if version: if version:
for b in builds: for b in builds:

11
platformio/util.py
View File

@ -4,7 +4,7 @@
from os import name as os_name from os import name as os_name
from os import getcwd, getenv, listdir, utime from os import getcwd, getenv, listdir, utime
from os.path import dirname, expanduser, isfile, join, realpath from os.path import dirname, expanduser, isfile, join, realpath
from platform import architecture, system from platform import system, uname
from subprocess import PIPE, Popen from subprocess import PIPE, Popen
from time import sleep from time import sleep
@ -18,8 +18,11 @@ except ImportError:
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
def get_system(): def get_systype():
return (system() + architecture()[0][:-3]).lower() if system() == "Windows":
return "windows"
data = uname()
return ("%s_%s" % (data[0], data[4])).lower()
def get_home_dir(): def get_home_dir():
@ -61,7 +64,7 @@ def change_filemtime(path, time):
def exec_command(args): def exec_command(args):
use_shell = get_system() == "windows32" use_shell = system() == "Windows"
p = Popen(args, stdout=PIPE, stderr=PIPE, shell=use_shell) p = Popen(args, stdout=PIPE, stderr=PIPE, shell=use_shell)
out, err = p.communicate() out, err = p.communicate()
return dict(out=out.strip(), err=err.strip()) return dict(out=out.strip(), err=err.strip())