Revert back to SCons 2.0, a lot of issues with non-unicode locales // Issue #895

This commit is contained in:
Ivan Kravets
2018-01-30 15:14:55 +02:00
parent 640aa72cff
commit fc53cb4489
3 changed files with 2 additions and 4 deletions

View File

@ -7,8 +7,6 @@ PlatformIO 3.0
3.5.2 (2018-??-??) 3.5.2 (2018-??-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Upgraded build system to `SCons <http://scons.org>`__ 3.0
(`issue #895 <https://github.com/platformio/platformio-core/issues/895>`_)
* Added aliases (off, light, strict) for * Added aliases (off, light, strict) for
`LDF Compatibility Modes <http://docs.platformio.org/page/librarymanager/ldf.html>`__ `LDF Compatibility Modes <http://docs.platformio.org/page/librarymanager/ldf.html>`__
* Show device system information (MCU, Frequency, RAM, Flash, Debugging tools) * Show device system information (MCU, Frequency, RAM, Flash, Debugging tools)

View File

@ -25,7 +25,7 @@ CORE_PACKAGES = {
"contrib-pysite": ">=0.1.2,<2", "contrib-pysite": ">=0.1.2,<2",
"tool-pioplus": ">=0.13.3,<2", "tool-pioplus": ">=0.13.3,<2",
"tool-unity": "~1.20302.1", "tool-unity": "~1.20302.1",
"tool-scons": ">=3.30000.0,<4" "tool-scons": "~2.20501.3"
} }
PIOPLUS_AUTO_UPDATES_MAX = 100 PIOPLUS_AUTO_UPDATES_MAX = 100

View File

@ -478,7 +478,7 @@ class PkgInstallerMixin(object):
target_dirname = "%s@src-%s" % ( target_dirname = "%s@src-%s" % (
pkg_dirname, pkg_dirname,
hashlib.md5(cur_manifest['__src_url']).hexdigest()) hashlib.md5(cur_manifest['__src_url']).hexdigest())
os.rename(pkg_dir, join(self.package_dir, str(target_dirname))) os.rename(pkg_dir, join(self.package_dir, target_dirname))
# fix to a version # fix to a version
elif action == 2: elif action == 2:
target_dirname = "%s@%s" % (pkg_dirname, target_dirname = "%s@%s" % (pkg_dirname,