From 64203d140395bfc1edcf8a424a2ccd902eee6adf Mon Sep 17 00:00:00 2001 From: Alexey Gerenkov Date: Fri, 16 Aug 2024 09:28:11 +0000 Subject: [PATCH] feat(tools): update esp-clang version to esp-18.1.2_20240912 --- tools/idf_tools.py | 14 +++++++++----- tools/tools.json | 39 ++++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/tools/idf_tools.py b/tools/idf_tools.py index 753e87e24a..a928c04656 100755 --- a/tools/idf_tools.py +++ b/tools/idf_tools.py @@ -2757,8 +2757,8 @@ class ChecksumFileParser(): * ... (2 lines for every artifact) ... """ - def __init__(self, tool_name: str, url: str) -> None: - self.tool_name = tool_name + def __init__(self, filename_prefix: str, url: str) -> None: + self.filename_prefix = filename_prefix sha256_file_tmp = os.path.join(g.idf_tools_path, 'tools', 'add-version.sha256.tmp') sha256_file = os.path.abspath(url) @@ -2793,8 +2793,8 @@ class ChecksumFileParser(): raise SystemExit(1) # crosstool-ng checksum file contains info about few tools # e.g.: "xtensa-esp32-elf", "xtensa-esp32s2-elf" - # filter records for file by tool_name to avoid mismatch - if not hash_filename.startswith(self.tool_name): + # filter records for file by filename_prefix to avoid mismatch + if not hash_filename.startswith(self.filename_prefix): continue size = self.parseLine(r'^# \S*: (\d*) bytes', bytes_str) sha256 = self.parseLine(r'^(\S*) ', hash_str) @@ -2828,7 +2828,8 @@ def action_add_version(args: Any) -> None: version_obj = IDFToolVersion(version, version_status) tool_obj.versions[version] = version_obj url_prefix = args.url_prefix or f'https://{TODO_MESSAGE}/' - checksum_info: ChecksumFileParser = (ChecksumFileParser(tool_name, args.checksum_file) + filename_prefix = args.dist_filename_prefix if len(args.dist_filename_prefix) else tool_name + checksum_info: ChecksumFileParser = (ChecksumFileParser(filename_prefix, args.checksum_file) if args.checksum_file else ChecksumCalculator(args.artifact_file)) # type: ignore for file_size, file_sha256, file_name in checksum_info: @@ -3160,6 +3161,9 @@ def main(argv: List[str]) -> None: add_version.add_argument('--version', help='Version identifier', required=True) add_version.add_argument('--url-prefix', help='String to prepend to file names to obtain download URLs') add_version.add_argument('--override', action='store_true', help='Override tool versions with new data') + add_version.add_argument('--dist-filename-prefix', + help='Prefix of distro archive name in checksum file. If skipped tool name is used.', + default='') add_version_files_group = add_version.add_mutually_exclusive_group(required=True) add_version_files_group.add_argument('--checksum-file', help='URL or path to local file with checksum/size for artifacts') add_version_files_group.add_argument('--artifact-file', help='File names of the download artifacts', nargs='*') diff --git a/tools/tools.json b/tools/tools.json index 6dd4d208f3..54b3037af7 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -251,6 +251,7 @@ "esp32c6", "esp32c5", "esp32h2", + "esp32p4", "esp32c61" ], "version_cmd": [ @@ -261,36 +262,36 @@ "versions": [ { "linux-amd64": { - "sha256": "c4d4bef40532b777907bdf35cf10d91432a4c6b8351ee0a21cf3332fc9aabdb1", - "size": 296940300, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-x86_64-linux-gnu.tar.xz" + "sha256": "aee15b8e02440f9ec6a8070f017621dc400dbd62a4701f9cf456dbe34d2a0c4d", + "size": 309829872, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-x86_64-linux-gnu.tar.xz" }, "linux-arm64": { - "sha256": "200d12bca443f8c751dfdd8e0abdc388832820ca8ebfff86952302146b972cf9", - "size": 286403588, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-aarch64-linux-gnu.tar.xz" + "sha256": "14abbc368d9c153270aa4d22ce28d78633cb0f1ca83d4be70591d9e39ae9bc82", + "size": 295561044, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-aarch64-linux-gnu.tar.xz" }, "linux-armhf": { - "sha256": "9731b04ef704748a2579ead5960a556e85ffd536d69b41022cbf2d5e59fa178c", - "size": 286907980, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-arm-linux-gnueabihf.tar.xz" + "sha256": "4133285303aabb1831c477536a13413319a569170b0aa54b92abe69cc0e7b938", + "size": 298186872, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-arm-linux-gnueabihf.tar.xz" }, "macos": { - "sha256": "02ebf1c3efc8b3514b774a5c02c51a5cdd23d6d35769c1a1698006bb41e25a97", - "size": 272744196, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-x86_64-apple-darwin.tar.xz" + "sha256": "b4641ec4dd574b6b7d037aa1bb2e5ff5a8a4623c88e89668db656282eb1d9dc8", + "size": 282868024, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-x86_64-apple-darwin.tar.xz" }, "macos-arm64": { - "sha256": "c422ebe6c497182020e9bb9e5896f415d3bc7635b4d996c7f16fb060124c28c2", - "size": 252779444, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-aarch64-apple-darwin.tar.xz" + "sha256": "5d2e187ef40ecc9996630a7c6efcc19bdfd32ec4ce8cc4dd3014cd24e7016560", + "size": 261757404, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-aarch64-apple-darwin.tar.xz" }, - "name": "esp-17.0.1_20240419", + "name": "esp-18.1.2_20240912", "status": "recommended", "win64": { - "sha256": "341d3eed6881fbea19910fee5254a2f9c5406d2948bf0814a1c567d8c65dadcb", - "size": 410784492, - "url": "https://github.com/espressif/llvm-project/releases/download/esp-17.0.1_20240419/clang-esp-17.0.1_20240419-x86_64-w64-mingw32.tar.xz" + "sha256": "c4af15073b105dc174c0452dfd1875bab200412fa3151c0363cfc0d30abf5173", + "size": 429583224, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-18.1.2_20240912/clang-esp-18.1.2_20240912-x86_64-w64-mingw32.tar.xz" } } ]