Fix esptool windows python path

Fixes a typo in the python path for Windows for upload.

package/build_boards_manager_package.sh

@@ -74,9 +74,13 @@ fi
 # handles tool paths differently when package is installed in hardware folder
 cat $srcdir/platform.txt | \
 $SED 's/runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-lx106-elf//g' | \
-$SED 's/runtime.tools.python.windows.path=.*//g' | \
+$SED 's/runtime.tools.python.path=.*//g' | \
 $SED 's/runtime.tools.esptool.path={runtime.platform.path}\/tools\/esptool//g' | \
 $SED 's/tools.esptool.path={runtime.platform.path}\/tools\/esptool/tools.esptool.path=\{runtime.tools.esptool.path\}/g' | \
+$SED 's/^tools.esptool.cmd=.*//g' | \
+$SED 's/^tools.esptool.network_cmd=.*//g' | \
+$SED 's/^#tools.esptool.cmd=/tools.esptool.cmd=/g' | \
+$SED 's/^#tools.esptool.network_cmd=/tools.esptool.network_cmd=/g' | \
 $SED 's/tools.mkspiffs.path={runtime.platform.path}\/tools\/mkspiffs/tools.mkspiffs.path=\{runtime.tools.mkspiffs.path\}/g' |\
 $SED 's/recipe.hooks.core.prebuild.2.pattern.*//g' |\
 $SED "s/version=.*/version=$ver/g" |\

platform.txt

@@ -8,14 +8,15 @@
 name=ESP8266 Boards (2.6.0-dev)
 version=2.6.0-dev
 
+# These will be removed by the packager script when doing a JSON release
 runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
+runtime.tools.python.path={runtime.platform.path}/tools/python
+
 runtime.tools.esptool.path={runtime.platform.path}/tools/esptool
 runtime.tools.signing={runtime.platform.path}/tools/signing.py
 runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
 runtime.tools.makecorever={runtime.platform.path}/tools/makecorever.py
 runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
-runtime.tools.python.path=/usr/bin
-runtime.tools.python.windows.path={runtime.platform.path}/tools/python
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w
@@ -66,9 +67,6 @@ compiler.elf2hex.flags=
 
 compiler.size.cmd=xtensa-lx106-elf-size
 
-compiler.esptool.cmd=esptool
-compiler.esptool.cmd.windows=esptool.exe
-
 # This can be overriden in boards.txt
 build.extra_flags=-DESP8266
 
@@ -124,11 +122,14 @@ recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
 # ------------------------------
 
 # Need to duplicate the python path because Arduino does not replace properly in this stage
-tools.esptool.cmd=python
-tools.esptool.cmd.windows={runtime.tools.python.windows.path}/python.exe
 tools.esptool.path=
-tools.esptool.network_cmd=python
-tools.esptool.network_cmd.windows={runtime.tools.python.windows.path}/python.exe
+# Because the variable expansion doesn't allow one tool to find another, the following lines
+# will point to "{runtime.platform.path}/python/python" in GIT and "{runtime.tools.python.path}/python"
+# for JSON board manager releases.
+#tools.esptool.cmd={runtime.tools.python.path}/python
+#tools.esptool.network_cmd={runtime.tools.python.path}/python
+tools.esptool.cmd={runtime.platform.path}/python/python
+tools.esptool.network_cmd={runtime.platform.path}/python/python
 
 tools.esptool.upload.protocol=esp
 tools.esptool.upload.params.verbose=--trace