@@ -216,6 +216,12 @@ find "$PKG_DIR" -name '*.git*' -type f -delete
216216# #
217217RVTC_NAME=" riscv32-esp-elf-gcc"
218218RVTC_NEW_NAME=" esp-rv32"
219+ X32TC_NAME=" xtensa-esp32-elf-gcc"
220+ X32TC_NEW_NAME=" esp-x32"
221+ XS2TC_NAME=" xtensa-esp32s2-elf-gcc"
222+ XS2TC_NEW_NAME=" esp-xs2"
223+ XS3TC_NAME=" xtensa-esp32s3-elf-gcc"
224+ XS3TC_NEW_NAME=" esp-xs3"
219225
220226# Replace tools locations in platform.txt
221227echo " Generating platform.txt..."
@@ -224,9 +230,9 @@ sed "s/version=.*/version=$RELEASE_TAG/g" | \
224230sed ' s/tools\.esp32-arduino-libs\.path\.windows=.*//g' | \
225231sed ' s/{runtime\.platform\.path}.tools.esp32-arduino-libs/\{runtime.tools.esp32-arduino-libs.path\}/g' | \
226232sed ' s/{runtime\.platform\.path}.tools.xtensa-esp-elf-gdb/\{runtime.tools.xtensa-esp-elf-gdb.path\}/g' | \
227- sed ' s/{runtime\.platform\.path}.tools.xtensa-esp32-elf/\{runtime.tools.xtensa-esp32-elf-gcc .path\}/g' | \
228- sed ' s/{runtime\.platform\.path}.tools.xtensa-esp32s2-elf/\{runtime.tools.xtensa-esp32s2-elf-gcc .path\}/g' | \
229- sed ' s/{runtime\.platform\.path}.tools.xtensa-esp32s3-elf/\{runtime.tools.xtensa-esp32s3-elf-gcc .path\}/g' | \
233+ sed " s/{runtime\.platform\.path}.tools.xtensa-esp32-elf/\\ {runtime.tools.$X32TC_NEW_NAME .path\\ }/g" | \
234+ sed " s/{runtime\.platform\.path}.tools.xtensa-esp32s2-elf/\\ {runtime.tools.$XS2TC_NEW_NAME .path\\ }/g" | \
235+ sed " s/{runtime\.platform\.path}.tools.xtensa-esp32s3-elf/\\ {runtime.tools.$XS3TC_NEW_NAME .path\\ }/g" | \
230236sed ' s/{runtime\.platform\.path}.tools.riscv32-esp-elf-gdb/\{runtime.tools.riscv32-esp-elf-gdb.path\}/g' | \
231237sed " s/{runtime\.platform\.path}.tools.riscv32-esp-elf/\\ {runtime.tools.$RVTC_NEW_NAME .path\\ }/g" | \
232238sed ' s/{runtime\.platform\.path}.tools.esptool/\{runtime.tools.esptool_py.path\}/g' | \
@@ -342,7 +348,19 @@ rvtc_jq_arg="\
342348 (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
343349 (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
344350 (.packages[0].tools[] | select(.name==\" $RVTC_NAME \" )).version = \" $RVTC_VERSION \" |\
345- (.packages[0].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" "
351+ (.packages[0].tools[] | select(.name==\" $RVTC_NAME \" )).name = \" $RVTC_NEW_NAME \" |\
352+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $X32TC_NAME \" )).version = \" $RVTC_VERSION \" |\
353+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $X32TC_NAME \" )).name = \" $X32TC_NEW_NAME \" |\
354+ (.packages[0].tools[] | select(.name==\" $X32TC_NAME \" )).version = \" $RVTC_VERSION \" |\
355+ (.packages[0].tools[] | select(.name==\" $X32TC_NAME \" )).name = \" $X32TC_NEW_NAME \" |\
356+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS2TC_NAME \" )).version = \" $RVTC_VERSION \" |\
357+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS2TC_NAME \" )).name = \" $XS2TC_NEW_NAME \" |\
358+ (.packages[0].tools[] | select(.name==\" $XS2TC_NAME \" )).version = \" $RVTC_VERSION \" |\
359+ (.packages[0].tools[] | select(.name==\" $XS2TC_NAME \" )).name = \" $XS2TC_NEW_NAME \" |\
360+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS3TC_NAME \" )).version = \" $RVTC_VERSION \" |\
361+ (.packages[0].platforms[0].toolsDependencies[] | select(.name==\" $XS3TC_NAME \" )).name = \" $XS3TC_NEW_NAME \" |\
362+ (.packages[0].tools[] | select(.name==\" $XS3TC_NAME \" )).version = \" $RVTC_VERSION \" |\
363+ (.packages[0].tools[] | select(.name==\" $XS3TC_NAME \" )).name = \" $XS3TC_NEW_NAME \" "
346364cat " $PACKAGE_JSON_TEMPLATE " | jq " $rvtc_jq_arg " > " $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
347365PACKAGE_JSON_TEMPLATE=" $OUTPUT_DIR /package-$LIBS_PROJ_NAME -rvfix.json"
348366
0 commit comments