platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable Cygwin support

Browse Source
This commit is contained in:
Ivan Kravets
2015-09-10 20:23:37 +03:00
parent 3a8c515e21
commit dcb6d8286b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.rst
View File

@ -7,7 +7,6 @@ PlatformIO 2.0
2.3.2 (2015-09-??) 2.3.2 (2015-09-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Allowed PlatformIO to be run within Cygwin environment
* Allowed to use ST-Link uploader for mbed-based projects * Allowed to use ST-Link uploader for mbed-based projects
* Explained how to use ``lib`` directory from the PlatformIO based project in * Explained how to use ``lib`` directory from the PlatformIO based project in
``readme.txt`` which will be automatically generated using ``readme.txt`` which will be automatically generated using

2
platformio/__init__.py
View File

@ -1,7 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
VERSION = (2, 3, "2.dev3") VERSION = (2, 3, "2.dev4")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

8
platformio/exception.py
View File

@ -196,3 +196,11 @@ class PlatformioUpgradeError(PlatformioException):
"2. Try different installation/upgrading steps: " "2. Try different installation/upgrading steps: "
"http://docs.platformio.org/en/latest/installation.html" "http://docs.platformio.org/en/latest/installation.html"
) )
class CygwinEnvDetected(PlatformioException):
MESSAGE = (
"PlatformIO does not work within Cygwin environment. "
"Use native Terminal instead."
)

7
platformio/util.py
View File

@ -116,13 +116,8 @@ def get_systype():
type_ = data[0].lower() type_ = data[0].lower()
arch = data[4].lower() if data[4] else "" arch = data[4].lower() if data[4] else ""
# use native Windows binaries for Cygwin
if "cygwin" in type_: if "cygwin" in type_:
if arch == "i686": raise exception.CygwinEnvDetected()
arch = "x86"
elif arch == "x86_64":
arch = "amd64"
type_ = "windows"
return "%s_%s" % (type_, arch) if arch else type_ return "%s_%s" % (type_, arch) if arch else type_