Skip to content

Commit e21bca8

Browse files
igrrigrr
committed
Move tools to platform directory
1 parent e8789e9 commit e21bca8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+672
-676
lines changed

‎build/build.xml

+19-23
Original file line numberDiff line numberDiff line change
@@ -387,24 +387,24 @@
387387
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
388388
</chmod>
389389

390-
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
390+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools" />
391391

392392
<antcall target="untar">
393393
<param name="archive_file" value="${staging_folder}/dist/osx-xtensa-lx106-elf.tgz" />
394394
<param name="archive_url" value="http://download.igrr.me/osx-xtensa-lx106-elf.tgz" />
395-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
396-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
395+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
396+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
397397
</antcall>
398398

399399

400400
<antcall target="unzip">
401401
<param name="archive_file" value="${staging_folder}/esptool-0.4.3-osx.zip" />
402402
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-osx.zip" />
403-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx" />
404-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
403+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-osx" />
404+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
405405
</antcall>
406-
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
407-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx/" />
406+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
407+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-osx/" />
408408

409409
</target>
410410

@@ -663,23 +663,21 @@
663663

664664
<antcall target="package-library-index-json-bundle"/>
665665

666-
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
667-
668666
<antcall target="untar">
669667
<param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
670668
<param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf.tgz" />
671-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
672-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
669+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
670+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
673671
</antcall>
674672

675673
<antcall target="unzip">
676674
<param name="archive_file" value="${staging_folder}/esptool-0.4.3-linux64.zip" />
677675
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-linux64.zip" />
678-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64" />
679-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
676+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-linux64" />
677+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
680678
</antcall>
681-
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
682-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64/" />
679+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
680+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-linux64/" />
683681

684682
</target>
685683

@@ -917,24 +915,22 @@
917915

918916
<antcall target="package-library-index-json-bundle"/>
919917

920-
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
921-
922918
<antcall target="untar">
923919
<param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" />
924920
<param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" />
925-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
926-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
921+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
922+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
927923
</antcall>
928924

929925

930926
<antcall target="unzip">
931927
<param name="archive_file" value="${staging_folder}/esptool-0.4.3-win32.zip" />
932928
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-win32.zip" />
933-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32" />
934-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
929+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-win32" />
930+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
935931
</antcall>
936-
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" />
937-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32/" />
932+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool.exe" />
933+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.3-win32/" />
938934

939935
</target>
940936

‎hardware/esp8266com/esp8266/platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
name=ESP8266 Modules
99
version=1.6.1
1010

11-
compiler.tools.path={runtime.ide.path}/hardware/tools/esp8266/
11+
compiler.tools.path={runtime.platform.path}/tools/
1212
compiler.path={compiler.tools.path}xtensa-lx106-elf/bin/
1313
compiler.sdk.path={compiler.tools.path}sdk/
1414

@@ -85,7 +85,7 @@ recipe.size.regex=^(?:\.text|\.data|\.rodata|\.irom0\.text|)\s+([0-9]+).*
8585

8686
tools.esptool.cmd=esptool
8787
tools.esptool.cmd.windows=esptool.exe
88-
tools.esptool.path={runtime.ide.path}/hardware/tools/esp8266
88+
tools.esptool.path={compiler.tools.path}
8989

9090
tools.esptool.upload.protocol=esp
9191
tools.esptool.upload.params.verbose=-vv

0 commit comments

Comments
 (0)