forked from platformio/platformio-core
Fix order for "listdir" method
This commit is contained in:
@ -1,6 +1,11 @@
|
|||||||
Release History
|
Release History
|
||||||
===============
|
===============
|
||||||
|
|
||||||
|
2.0.2 (2015-05-27)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* Fixed libraries order for "Library Dependency Finder" under Linux OS
|
||||||
|
|
||||||
2.0.1 (2015-05-27)
|
2.0.1 (2015-05-27)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
@ -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, 0, 1)
|
VERSION = (2, 0, "2.dev0")
|
||||||
__version__ = ".".join([str(s) for s in VERSION])
|
__version__ = ".".join([str(s) for s in VERSION])
|
||||||
|
|
||||||
__title__ = "platformio"
|
__title__ = "platformio"
|
||||||
|
@ -161,7 +161,7 @@ if BOARD_BUILDOPTS.get("core", None) == "teensy":
|
|||||||
# search relative includes in teensy directories
|
# search relative includes in teensy directories
|
||||||
core_dir = join(env.get("PIOHOME_DIR"), "packages",
|
core_dir = join(env.get("PIOHOME_DIR"), "packages",
|
||||||
"framework-arduinoteensy", "cores", "teensy")
|
"framework-arduinoteensy", "cores", "teensy")
|
||||||
for item in listdir(core_dir):
|
for item in sorted(listdir(core_dir)):
|
||||||
file_path = join(core_dir, item)
|
file_path = join(core_dir, item)
|
||||||
if not isfile(file_path):
|
if not isfile(file_path):
|
||||||
continue
|
continue
|
||||||
|
@ -32,7 +32,7 @@ BOARD_BUILDOPTS = env.get("BOARD_OPTIONS", {}).get("build", {})
|
|||||||
def find_ldscript(src_dir):
|
def find_ldscript(src_dir):
|
||||||
ldscript = None
|
ldscript = None
|
||||||
matches = []
|
matches = []
|
||||||
for item in listdir(src_dir):
|
for item in sorted(listdir(src_dir)):
|
||||||
_path = join(src_dir, item)
|
_path = join(src_dir, item)
|
||||||
if not isfile(_path) or not item.endswith(".ld"):
|
if not isfile(_path) or not item.endswith(".ld"):
|
||||||
continue
|
continue
|
||||||
|
@ -207,7 +207,7 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
|
|||||||
if not isdir(lsd_dir):
|
if not isdir(lsd_dir):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
for ld in USE_LIBS + listdir(lsd_dir):
|
for ld in USE_LIBS + sorted(listdir(lsd_dir)):
|
||||||
if not isdir(join(lsd_dir, ld)):
|
if not isdir(join(lsd_dir, ld)):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -23,8 +23,8 @@ class ProjectGenerator(object):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_supported_ides():
|
def get_supported_ides():
|
||||||
tpls_dir = join(util.get_source_dir(), "ide", "tpls")
|
tpls_dir = join(util.get_source_dir(), "ide", "tpls")
|
||||||
return [d for d in listdir(tpls_dir)
|
return sorted([d for d in listdir(tpls_dir)
|
||||||
if isdir(join(tpls_dir, d))]
|
if isdir(join(tpls_dir, d))])
|
||||||
|
|
||||||
def get_project_env(self):
|
def get_project_env(self):
|
||||||
data = {"env_name": "PlatformIO"}
|
data = {"env_name": "PlatformIO"}
|
||||||
|
@ -36,7 +36,7 @@ class LibraryManager(object):
|
|||||||
items = {}
|
items = {}
|
||||||
if not isdir(self.lib_dir):
|
if not isdir(self.lib_dir):
|
||||||
return items
|
return items
|
||||||
for dirname in listdir(self.lib_dir):
|
for dirname in sorted(listdir(self.lib_dir)):
|
||||||
conf_path = join(self.lib_dir, dirname, self.CONFIG_NAME)
|
conf_path = join(self.lib_dir, dirname, self.CONFIG_NAME)
|
||||||
if not isfile(conf_path):
|
if not isfile(conf_path):
|
||||||
continue
|
continue
|
||||||
|
@ -139,7 +139,7 @@ class PlatformFactory(object):
|
|||||||
pdir = join(d, "platforms")
|
pdir = join(d, "platforms")
|
||||||
if not isdir(pdir):
|
if not isdir(pdir):
|
||||||
continue
|
continue
|
||||||
for p in listdir(pdir):
|
for p in sorted(listdir(pdir)):
|
||||||
if (p in ("__init__.py", "base.py") or not
|
if (p in ("__init__.py", "base.py") or not
|
||||||
p.endswith(".py")):
|
p.endswith(".py")):
|
||||||
continue
|
continue
|
||||||
|
@ -307,7 +307,7 @@ def _lookup_boards():
|
|||||||
bdirs.append(join(get_home_dir(), "boards"))
|
bdirs.append(join(get_home_dir(), "boards"))
|
||||||
|
|
||||||
for bdir in bdirs:
|
for bdir in bdirs:
|
||||||
for json_file in os.listdir(bdir):
|
for json_file in sorted(os.listdir(bdir)):
|
||||||
if not json_file.endswith(".json"):
|
if not json_file.endswith(".json"):
|
||||||
continue
|
continue
|
||||||
with open(join(bdir, json_file)) as f:
|
with open(join(bdir, json_file)) as f:
|
||||||
|
Reference in New Issue
Block a user