arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Update esptool to latest release

Browse Source
This commit is contained in:
Ivan Grokhotkov
2015-03-27 12:09:47 +03:00
parent c540bbab00
commit c72529bf6d
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/build.xml
View File

@ -138,13 +138,6 @@
</copy> </copy>
<antcall target="untar">
<param name="archive_file" value="./esptool-0.0.3.tgz" />
<param name="archive_url" value="http://download.igrr.me/esptool-0.0.3.tgz" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
<!-- copy shared examples folder --> <!-- copy shared examples folder -->
<copy todir="${target.path}/examples"> <copy todir="${target.path}/examples">
<fileset dir="shared/examples" /> <fileset dir="shared/examples" />
@ -362,10 +355,6 @@
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/> <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
</delete> </delete>
<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" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" />
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.zip" /> <param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" /> <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@ -390,6 +379,14 @@
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" /> <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall> </antcall>
<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-osx.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-osx.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
<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" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx/" />
</target> </target>
@ -896,17 +893,23 @@
<fileset dir="windows/work/hardware/tools/avr/doc" /> <fileset dir="windows/work/hardware/tools/avr/doc" />
</delete> </delete>
<antcall target="untar"> <antcall target="untar">
<param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" /> <param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" />
<param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" /> <param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" /> <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" /> <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall> </antcall>
<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" />
<antcall target="unzip">
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" /> <param name="archive_file" value="${staging_folder}/esptool-0.4.2-win32.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-win32.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
<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" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" />
</target> </target>
<target name="windows-run" depends="windows-build" <target name="windows-run" depends="windows-build"