Skip to content

Commit ec3e6d5

Browse files
committed
use versioned names for toolchain and fix build
mkdir tools folder on windows and linux
1 parent e32345d commit ec3e6d5

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

build/build.xml

+10-6
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@
390390
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools" />
391391

392392
<antcall target="untar">
393-
<param name="archive_file" value="${staging_folder}/dist/osx-xtensa-lx106-elf.tgz" />
394-
<param name="archive_url" value="http://download.igrr.me/osx-xtensa-lx106-elf.tgz" />
393+
<param name="archive_file" value="${staging_folder}/dist/osx-xtensa-lx106-elf-gb404fb9.tgz" />
394+
<param name="archive_url" value="http://download.igrr.me/osx-xtensa-lx106-elf-gb404fb9.tgz" />
395395
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
396396
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
397397
</antcall>
@@ -663,9 +663,11 @@
663663

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

666+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools" />
667+
666668
<antcall target="untar">
667-
<param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
668-
<param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf.tgz" />
669+
<param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf-gb404fb9.tgz" />
670+
<param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf-gb404fb9.tgz" />
669671
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
670672
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
671673
</antcall>
@@ -914,10 +916,12 @@
914916
</antcall>
915917

916918
<antcall target="package-library-index-json-bundle"/>
919+
920+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools" />
917921

918922
<antcall target="untar">
919-
<param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" />
920-
<param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" />
923+
<param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf-gb404fb9.tgz" />
924+
<param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf-gb404fb9.tgz" />
921925
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
922926
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
923927
</antcall>

build/build_board_manager_package.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ cat << EOF > package_esp8266com_index.json
5050
"toolsDependencies":[ {
5151
"packager":"esp8266",
5252
"name":"esptool",
53-
"version":"0.4.3"
53+
"version":"0.4.4"
5454
},
5555
{
5656
"packager":"esp8266",
@@ -61,7 +61,7 @@ cat << EOF > package_esp8266com_index.json
6161
6262
"tools": [ {
6363
"name":"esptool",
64-
"version":"0.4.3",
64+
"version":"0.4.4",
6565
"systems": [
6666
{
6767
"host":"i686-mingw32",
@@ -92,22 +92,22 @@ cat << EOF > package_esp8266com_index.json
9292
"systems": [
9393
{
9494
"host":"i686-mingw32",
95-
"url":"http://arduino.esp8266.com/win32-xtensa-lx106-elf.tar.gz",
96-
"archiveFileName":"win32-xtensa-lx106-elf.tar.gz",
95+
"url":"http://arduino.esp8266.com/win32-xtensa-lx106-elf-gb404fb9.tar.gz",
96+
"archiveFileName":"win32-xtensa-lx106-elf-gb404fb9.tar.gz",
9797
"checksum":"SHA-256:1561ec85cc58cab35cc48bfdb0d0087809f89c043112a2c36b54251a13bf781f",
9898
"size":"153807368"
9999
},
100100
{
101101
"host":"x86_64-apple-darwin",
102-
"url":"http://arduino.esp8266.com/osx-xtensa-lx106-elf.tar.gz",
103-
"archiveFileName":"osx-xtensa-lx106-elf.tar.gz",
102+
"url":"http://arduino.esp8266.com/osx-xtensa-lx106-elf-gb404fb9.tar.gz",
103+
"archiveFileName":"osx-xtensa-lx106-elf-gb404fb9.tar.gz",
104104
"checksum":"SHA-256:540be2ca32637584463a4a4d04717f6c79c7355e336b8c3578b0947218cf92b9",
105105
"size":"35189446"
106106
},
107107
{
108108
"host":"x86_64-pc-linux-gnu",
109-
"url":"http://arduino.esp8266.com/linux64-xtensa-lx106-elf.tar.gz",
110-
"archiveFileName":"linux64-xtensa-lx106-elf.tar.gz",
109+
"url":"http://arduino.esp8266.com/linux64-xtensa-lx106-elf-gb404fb9.tar.gz",
110+
"archiveFileName":"linux64-xtensa-lx106-elf-gb404fb9.tar.gz",
111111
"checksum":"SHA-256:46f057fbd8b320889a26167daf325038912096d09940b2a95489db92431473b7",
112112
"size":"30262903"
113113
}

0 commit comments

Comments
 (0)