Merge branch 'release/v2.0.2'

HISTORY.rst

@@ -1,7 +1,12 @@
 Release History
 ===============
 
-2.0.1 (2015-??-??)
+2.0.2 (2015-05-27)
+------------------
+
+* Fixed libraries order for "Library Dependency Finder" under Linux OS
+
+2.0.1 (2015-05-27)
 ------------------
 
 * Handle new environment variables

platformio/__init__.py

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

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

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

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
 

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)
+        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):
         data = {"env_name": "PlatformIO"}

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

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

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: