Skip to content

Commit c72529b

Browse files
committed
Update esptool to latest release
1 parent c540bba commit c72529b

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

build/build.xml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,6 @@
138138
</copy>
139139

140140

141-
<antcall target="untar">
142-
<param name="archive_file" value="./esptool-0.0.3.tgz" />
143-
<param name="archive_url" value="http://download.igrr.me/esptool-0.0.3.tgz" />
144-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3" />
145-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
146-
</antcall>
147-
148141
<!-- copy shared examples folder -->
149142
<copy todir="${target.path}/examples">
150143
<fileset dir="shared/examples" />
@@ -362,10 +355,6 @@
362355
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
363356
</delete>
364357

365-
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/esptool_osx" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
366-
367-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" />
368-
369358
<antcall target="unzip">
370359
<param name="archive_file" value="./libastylej-2.05.zip" />
371360
<param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@@ -390,6 +379,14 @@
390379
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
391380
</antcall>
392381

382+
<antcall target="unzip">
383+
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-osx.zip" />
384+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-osx.zip" />
385+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx" />
386+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
387+
</antcall>
388+
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
389+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx/" />
393390

394391
</target>
395392

@@ -896,17 +893,23 @@
896893
<fileset dir="windows/work/hardware/tools/avr/doc" />
897894
</delete>
898895

899-
<antcall target="untar">
896+
<antcall target="untar">
900897
<param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" />
901898
<param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" />
902899
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
903900
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
904901
</antcall>
905902

906-
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" />
907-
908-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" />
909-
903+
904+
<antcall target="unzip">
905+
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-win32.zip" />
906+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-win32.zip" />
907+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" />
908+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
909+
</antcall>
910+
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
911+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" />
912+
910913
</target>
911914

912915
<target name="windows-run" depends="windows-build"

0 commit comments

Comments
 (0)