Merge branch 'release/v2.2.2'

Author: ivankravets

builder/frameworks/esp8266-nonos-sdk.py

@@ -103,7 +103,7 @@
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
-                'esptool',
+                join(platform.get_package_dir("tool-esptool"), "esptool"),
                 "-eo", "$SOURCE",
                 "-bo", "${TARGET}",
                 "-bm", "$BOARD_FLASH_MODE",

builder/frameworks/esp8266-rtos-sdk.py

@@ -104,7 +104,7 @@
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
-                'esptool',
+                join(platform.get_package_dir("tool-esptool"), "esptool"),
                 "-eo", "$SOURCE",
                 "-bo", "${TARGET}",
                 "-bm", "$BOARD_FLASH_MODE",

builder/frameworks/simba.py

@@ -46,13 +46,14 @@ def VariantDirWrap(env, variant_dir, src_dir, duplicate=False):
 
 
 env = DefaultEnvironment()
+platform = env.PioPlatform()
 
 env.AddMethod(LookupSources)
 env.AddMethod(VariantDirWrap)
 
 env.Replace(
-    PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba"),
-    OBJCOPY="esptool"
+    PLATFORMFW_DIR=platform.get_package_dir("framework-simba"),
+    OBJCOPY=join(platform.get_package_dir("tool-esptool"), "esptool")
 )
 
 env.Append(
@@ -63,7 +64,7 @@ def VariantDirWrap(env, variant_dir, src_dir, duplicate=False):
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
-                'esptool',
+                join(platform.get_package_dir("tool-esptool"), "esptool"),
                 "-eo", '"%s"' % join(
                     "$PLATFORMFW_DIR", "3pp", "esp8266Arduino", "2.3.0",
                     "bootloaders", "eboot", "eboot.elf"

builder/main.py

@@ -19,7 +19,7 @@
 from os.path import join
 
 
-from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
+from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild,
                           Builder, Default, DefaultEnvironment)
 from platformio import util
 
@@ -200,15 +200,16 @@ def _update_max_upload_size(env):
 # Target: Build executable and linkable firmware or SPIFFS image
 #
 
-target_elf = env.BuildProgram()
-
+target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
+    target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
     if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
         fetch_spiffs_size(env)
         target_firm = join("$BUILD_DIR", "spiffs.bin")
     else:
         target_firm = join("$BUILD_DIR", "${PROGNAME}.bin")
 else:
+    target_elf = env.BuildProgram()
     if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
         target_firm = env.DataToBin(
             join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.2.1",
+  "version": "2.2.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",