From 5e340843b176f8d2779aac38934a873bcb78c04b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 27 May 2015 19:21:29 +0300 Subject: [PATCH] Fix order for "listdir" method --- HISTORY.rst | 5 +++++ platformio/__init__.py | 2 +- platformio/builder/scripts/frameworks/arduino.py | 2 +- platformio/builder/scripts/frameworks/libopencm3.py | 2 +- platformio/builder/tools/platformio.py | 2 +- platformio/ide/projectgenerator.py | 4 ++-- platformio/libmanager.py | 2 +- platformio/platforms/base.py | 2 +- platformio/util.py | 2 +- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 04aa3502..f11395b0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,11 @@ Release History =============== +2.0.2 (2015-05-27) +------------------ + +* Fixed libraries order for "Library Dependency Finder" under Linux OS + 2.0.1 (2015-05-27) ------------------ diff --git a/platformio/__init__.py b/platformio/__init__.py index a38b7a47..1c1fa026 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (2, 0, 1) +VERSION = (2, 0, "2.dev0") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index 1761e0e9..8d321880 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -161,7 +161,7 @@ if BOARD_BUILDOPTS.get("core", None) == "teensy": # search relative includes in teensy directories core_dir = join(env.get("PIOHOME_DIR"), "packages", "framework-arduinoteensy", "cores", "teensy") - for item in listdir(core_dir): + for item in sorted(listdir(core_dir)): file_path = join(core_dir, item) if not isfile(file_path): continue diff --git a/platformio/builder/scripts/frameworks/libopencm3.py b/platformio/builder/scripts/frameworks/libopencm3.py index 72a762c5..ec6f37ce 100644 --- a/platformio/builder/scripts/frameworks/libopencm3.py +++ b/platformio/builder/scripts/frameworks/libopencm3.py @@ -32,7 +32,7 @@ BOARD_BUILDOPTS = env.get("BOARD_OPTIONS", {}).get("build", {}) def find_ldscript(src_dir): ldscript = None matches = [] - for item in listdir(src_dir): + for item in sorted(listdir(src_dir)): _path = join(src_dir, item) if not isfile(_path) or not item.endswith(".ld"): continue diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index 7eae3b34..b0673c06 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -207,7 +207,7 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914 if not isdir(lsd_dir): 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)): continue diff --git a/platformio/ide/projectgenerator.py b/platformio/ide/projectgenerator.py index e98282cb..c3ee89c9 100644 --- a/platformio/ide/projectgenerator.py +++ b/platformio/ide/projectgenerator.py @@ -23,8 +23,8 @@ class ProjectGenerator(object): @staticmethod def get_supported_ides(): tpls_dir = join(util.get_source_dir(), "ide", "tpls") - return [d for d in listdir(tpls_dir) - if isdir(join(tpls_dir, d))] + return sorted([d for d in listdir(tpls_dir) + if isdir(join(tpls_dir, d))]) def get_project_env(self): data = {"env_name": "PlatformIO"} diff --git a/platformio/libmanager.py b/platformio/libmanager.py index 0dfd220d..a358ae7f 100644 --- a/platformio/libmanager.py +++ b/platformio/libmanager.py @@ -36,7 +36,7 @@ class LibraryManager(object): items = {} if not isdir(self.lib_dir): 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) if not isfile(conf_path): continue diff --git a/platformio/platforms/base.py b/platformio/platforms/base.py index b1305c3f..7dd2732f 100644 --- a/platformio/platforms/base.py +++ b/platformio/platforms/base.py @@ -139,7 +139,7 @@ class PlatformFactory(object): pdir = join(d, "platforms") if not isdir(pdir): continue - for p in listdir(pdir): + for p in sorted(listdir(pdir)): if (p in ("__init__.py", "base.py") or not p.endswith(".py")): continue diff --git a/platformio/util.py b/platformio/util.py index b1e512bc..4afa52cf 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -307,7 +307,7 @@ def _lookup_boards(): bdirs.append(join(get_home_dir(), "boards")) 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"): continue with open(join(bdir, json_file)) as f: