Skip to content

Commit

Permalink
Update esptool to latest release
Browse files Browse the repository at this point in the history
  • Loading branch information
igrr committed Mar 27, 2015
1 parent c540bba commit c72529b
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,6 @@
</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 todir="${target.path}/examples">
<fileset dir="shared/examples" />
Expand Down Expand Up @@ -362,10 +355,6 @@
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
</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">
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
Expand All @@ -390,6 +379,14 @@
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</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>

Expand Down Expand Up @@ -896,17 +893,23 @@
<fileset dir="windows/work/hardware/tools/avr/doc" />
</delete>

<antcall target="untar">
<antcall target="untar">
<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="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/" />
</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" />

<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" />


<antcall target="unzip">
<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 name="windows-run" depends="windows-build"
Expand Down

0 comments on commit c72529b

Please sign in to comment.