Merge branch 'release/v1.2.0'

Author: ivankravets

builder/main.py

@@ -115,7 +115,8 @@ def _get_board_f_flash(env):
     #
 
     UPLOADER="esptool",
-    UPLOADEROTA=join("$FRAMEWORK_ARDUINOESP8266_DIR", "tools", "espota.py"),
+    UPLOADEROTA=join(platform.get_package_dir("tool-espotapy") or "",
+                     "espota.py"),
 
     UPLOADERFLAGS=[
         "-cd", "$UPLOAD_RESETMETHOD",
@@ -352,8 +353,8 @@ def __tmp_hook_before_pio_3_2():
             target_firm = env.ElfToBin(
                 join("$BUILD_DIR", "firmware"), target_elf)
 
-target_buildprog = env.Alias("buildprog", target_firm)
 AlwaysBuild(env.Alias("nobuild", target_firm))
+target_buildprog = env.Alias("buildprog", target_firm, target_firm)
 
 #
 # Target: Print binary size

platform.json

@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "1.1.3",
+  "version": "1.2.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -49,6 +49,10 @@
       "type": "uploader",
       "version": "~1.409.0"
     },
+    "tool-espotapy": {
+      "type": "uploader",
+      "version": "~1.0.0"
+    },
     "tool-mkspiffs": {
       "type": "uploader",
       "optional": true,