diff --git a/darwin/Dockerfile b/darwin/Dockerfile index b72ec95..3039264 100644 --- a/darwin/Dockerfile +++ b/darwin/Dockerfile @@ -11,9 +11,9 @@ RUN bash /toolchain/src/build-mac-binutils.sh FROM MacOSVenturaWithBrew AS flipperzero-toolchain-python RUN brew install coreutils -ADD https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/Python-3.11.2.tgz -C /toolchain/src/src/ -RUN mv /toolchain/src/src/Python-3.11.2 /toolchain/src/src/python +ADD https://www.python.org/ftp/python/3.12.4/Python-3.12.4.tgz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/Python-3.12.4.tgz -C /toolchain/src/src/ +RUN mv /toolchain/src/src/Python-3.12.4 /toolchain/src/src/python ADD https://www.openssl.org/source/openssl-1.1.1w.tar.gz /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/openssl-1.1.1w.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/openssl-1.1.1w /toolchain/src/src/openssl @@ -57,18 +57,18 @@ RUN brew install cmake automake autoconf libtool pkg-config ADD https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-cpp-3.21.7.tar.gz /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-17.0.6.src.tar.xz /toolchain/src/src/archives/ +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz /toolchain/src/src/archives/ RUN mkdir -p /toolchain/src/src/clang-format -RUN tar -xvf /toolchain/src/src/archives/llvm-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/clang-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/ -RUN mv /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang-17.0.6.src /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/cmake-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/cmake-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/cmake-17.0.6.src /toolchain/src/src/clang-format/cmake -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/third-party-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/third-party-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/third-party-17.0.6.src /toolchain/src/src/clang-format/third-party +RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/ +RUN mv /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/cmake-18.1.8.src /toolchain/src/src/clang-format/cmake +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/third-party-18.1.8.src /toolchain/src/src/clang-format/third-party ADD https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2 /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/libusb-1.0.24.tar.bz2 -C /toolchain/src/src/ RUN mv /toolchain/src/src/libusb-1.0.24 /toolchain/src/src/libusb diff --git a/darwin/requirements.txt b/darwin/requirements.txt index b88ae99..d5b442e 100644 --- a/darwin/requirements.txt +++ b/darwin/requirements.txt @@ -1,36 +1,39 @@ -ansi==0.3.6 -bitstring==3.1.9 -black==23.1.0 -certifi==2022.12.7 -cffi==1.15.1 -charset-normalizer==3.0.1 -click==8.1.3 -colorlog==6.7.0 +ansi==0.3.7 +bitarray==2.9.2 +bitstring==4.2.3 +black==24.4.2 +certifi==2024.6.2 +cffi==1.16.0 +charset-normalizer==3.3.2 +click==8.1.7 +colorlog==6.8.2 contextlib2==21.6.0 -cryptography==39.0.1 -dataclass-wizard==0.22.2 -ecdsa==0.18.0 -esptool==4.4 -gitdb==4.0.10 -GitPython==3.1.29 -heatshrink2==0.12.0 -idna==3.4 -lxml==4.9.2 +cryptography==42.0.8 +dataclass-wizard==0.22.3 +ecdsa==0.19.0 +esptool==4.7.0 +gitdb==4.0.11 +heatshrink2==0.13.0 +idna==3.7 +intelhex==2.3.0 +lxml==5.2.2 +mypy==1.10.1 mypy-extensions==1.0.0 -packaging==23.0 -pathspec==0.11.0 -Pillow==9.4.0 -platformdirs==3.0.0 -protobuf==4.21.12 -pycparser==2.21 +packaging==24.1 +pathspec==0.12.1 +pillow==10.4.0 +platformdirs==4.2.2 +protobuf==4.25.3 +pycparser==2.22 +pyelftools==0.31 pyserial==3.5 python3-protobuf==2.5.0 -PyYAML==6.0 -reedsolo==1.5.4 -requests==2.28.2 -schema==0.7.5 -SCons==4.6.0 -pyelftools==0.29 +PyYAML==6.0.1 +reedsolo==1.7.0 +requests==2.32.3 +schema==0.7.7 +SCons==4.7.0 six==1.16.0 -smmap==5.0.0 -urllib3==1.26.14 +smmap==5.0.1 +typing_extensions==4.12.2 +urllib3==2.2.2 diff --git a/darwin/scripts/build-mac-flipper-tools.sh b/darwin/scripts/build-mac-flipper-tools.sh index c5bd337..4fcae9c 100755 --- a/darwin/scripts/build-mac-flipper-tools.sh +++ b/darwin/scripts/build-mac-flipper-tools.sh @@ -85,7 +85,7 @@ function build_clang_format_x86_64() { CFLAGS="$MAC_X86_64_FLAGS" \ LDFLAGS="$MAC_X86_64_FLAGS" \ cmake \ - -S /toolchain/src/src/clang-format/llvm-17.0.6.src \ + -S /toolchain/src/src/clang-format/llvm-18.1.8.src \ -B build \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_BUILD_TYPE=Release \ @@ -118,7 +118,7 @@ function build_clang_format_arm64() { CFLAGS="$MAC_ARM64_FLAGS" \ LDFLAGS="$MAC_ARM64_FLAGS" \ cmake \ - -S /toolchain/src/src/clang-format/llvm-17.0.6.src \ + -S /toolchain/src/src/clang-format/llvm-18.1.8.src \ -B build \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/darwin/scripts/python3-config-arm64.sh b/darwin/scripts/python3-config-arm64.sh index 003a926..1455f54 100755 --- a/darwin/scripts/python3-config-arm64.sh +++ b/darwin/scripts/python3-config-arm64.sh @@ -7,9 +7,9 @@ while [ $# -ge 1 ]; do OP="$1" case $OP in --libs|--ldflags) - echo "$("$MAC_ARM64_OUTPUT_ROOT/bin/python3.11-config" "$OP" --embed) -L$MAC_ARM64_OUTPUT_ROOT/lib";; + echo "$("$MAC_ARM64_OUTPUT_ROOT/bin/python3.12-config" "$OP" --embed) -L$MAC_ARM64_OUTPUT_ROOT/lib";; --*) - echo "$("$MAC_ARM64_OUTPUT_ROOT/bin/python3.11-config" "$OP")";; + echo "$("$MAC_ARM64_OUTPUT_ROOT/bin/python3.12-config" "$OP")";; *) ;; esac diff --git a/darwin/scripts/python3-config-x86_64.sh b/darwin/scripts/python3-config-x86_64.sh index 2754c0f..69716d1 100755 --- a/darwin/scripts/python3-config-x86_64.sh +++ b/darwin/scripts/python3-config-x86_64.sh @@ -7,9 +7,9 @@ while [ $# -ge 1 ]; do OP="$1" case $OP in --libs|--ldflags) - echo "$("$MAC_X86_64_OUTPUT_ROOT/bin/python3.11-config" "$OP" --embed) -L$MAC_X86_64_OUTPUT_ROOT/lib";; + echo "$("$MAC_X86_64_OUTPUT_ROOT/bin/python3.12-config" "$OP" --embed) -L$MAC_X86_64_OUTPUT_ROOT/lib";; --*) - echo "$("$MAC_X86_64_OUTPUT_ROOT/bin/python3.11-config" "$OP")";; + echo "$("$MAC_X86_64_OUTPUT_ROOT/bin/python3.12-config" "$OP")";; *) ;; esac diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64 index cb4815f..1a66a51 100644 --- a/linux/Dockerfile-aarch64 +++ b/linux/Dockerfile-aarch64 @@ -13,9 +13,9 @@ ADD scripts/build-linux-gcc-build-libs.sh /toolchain/src/ RUN bash /toolchain/src/build-linux-gcc-build-libs.sh FROM flipperzero-toolchain-linux-build-deps AS flipperzero-toolchain-linux-python-build-libs -ADD https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/Python-3.11.2.tgz -C /toolchain/src/src/ -RUN mv /toolchain/src/src/Python-3.11.2 /toolchain/src/src/python +ADD https://www.python.org/ftp/python/3.12.4/Python-3.12.4.tgz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/Python-3.12.4.tgz -C /toolchain/src/src/ +RUN mv /toolchain/src/src/Python-3.12.4 /toolchain/src/src/python ADD https://www.openssl.org/source/openssl-1.1.1w.tar.gz /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/openssl-1.1.1w.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/openssl-1.1.1w /toolchain/src/src/openssl @@ -83,18 +83,18 @@ ADD https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-17.0.6.src.tar.xz /toolchain/src/src/archives/ +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz /toolchain/src/src/archives/ RUN mkdir -p /toolchain/src/src/clang-format -RUN tar -xvf /toolchain/src/src/archives/llvm-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/clang-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/ -RUN mv /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang-17.0.6.src /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/cmake-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/cmake-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/cmake-17.0.6.src /toolchain/src/src/clang-format/cmake -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/third-party-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/third-party-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/third-party-17.0.6.src /toolchain/src/src/clang-format/third-party +RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/ +RUN mv /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/cmake-18.1.8.src /toolchain/src/src/clang-format/cmake +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/third-party-18.1.8.src /toolchain/src/src/clang-format/third-party ADD https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2 /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/libusb-1.0.24.tar.bz2 -C /toolchain/src/src/ diff --git a/linux/Dockerfile-x86_64 b/linux/Dockerfile-x86_64 index d50c7ff..454d632 100644 --- a/linux/Dockerfile-x86_64 +++ b/linux/Dockerfile-x86_64 @@ -13,9 +13,9 @@ ADD scripts/build-linux-gcc-build-libs.sh /toolchain/src/ RUN bash /toolchain/src/build-linux-gcc-build-libs.sh FROM flipperzero-toolchain-linux-build-deps AS flipperzero-toolchain-linux-python-build-libs -ADD https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/Python-3.11.2.tgz -C /toolchain/src/src/ -RUN mv /toolchain/src/src/Python-3.11.2 /toolchain/src/src/python +ADD https://www.python.org/ftp/python/3.12.4/Python-3.12.4.tgz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/Python-3.12.4.tgz -C /toolchain/src/src/ +RUN mv /toolchain/src/src/Python-3.12.4 /toolchain/src/src/python ADD https://www.openssl.org/source/openssl-1.1.1w.tar.gz /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/openssl-1.1.1w.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/openssl-1.1.1w /toolchain/src/src/openssl @@ -83,18 +83,18 @@ ADD https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-17.0.6.src.tar.xz /toolchain/src/src/archives/ +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz /toolchain/src/src/archives/ RUN mkdir -p /toolchain/src/src/clang-format -RUN tar -xvf /toolchain/src/src/archives/llvm-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/clang-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/ -RUN mv /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang-17.0.6.src /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/cmake-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/cmake-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/cmake-17.0.6.src /toolchain/src/src/clang-format/cmake -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/third-party-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/third-party-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/third-party-17.0.6.src /toolchain/src/src/clang-format/third-party +RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/ +RUN mv /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/cmake-18.1.8.src /toolchain/src/src/clang-format/cmake +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/third-party-18.1.8.src /toolchain/src/src/clang-format/third-party ADD https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2 /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/libusb-1.0.24.tar.bz2 -C /toolchain/src/src/ diff --git a/linux/requirements.txt b/linux/requirements.txt index b88ae99..d5b442e 100644 --- a/linux/requirements.txt +++ b/linux/requirements.txt @@ -1,36 +1,39 @@ -ansi==0.3.6 -bitstring==3.1.9 -black==23.1.0 -certifi==2022.12.7 -cffi==1.15.1 -charset-normalizer==3.0.1 -click==8.1.3 -colorlog==6.7.0 +ansi==0.3.7 +bitarray==2.9.2 +bitstring==4.2.3 +black==24.4.2 +certifi==2024.6.2 +cffi==1.16.0 +charset-normalizer==3.3.2 +click==8.1.7 +colorlog==6.8.2 contextlib2==21.6.0 -cryptography==39.0.1 -dataclass-wizard==0.22.2 -ecdsa==0.18.0 -esptool==4.4 -gitdb==4.0.10 -GitPython==3.1.29 -heatshrink2==0.12.0 -idna==3.4 -lxml==4.9.2 +cryptography==42.0.8 +dataclass-wizard==0.22.3 +ecdsa==0.19.0 +esptool==4.7.0 +gitdb==4.0.11 +heatshrink2==0.13.0 +idna==3.7 +intelhex==2.3.0 +lxml==5.2.2 +mypy==1.10.1 mypy-extensions==1.0.0 -packaging==23.0 -pathspec==0.11.0 -Pillow==9.4.0 -platformdirs==3.0.0 -protobuf==4.21.12 -pycparser==2.21 +packaging==24.1 +pathspec==0.12.1 +pillow==10.4.0 +platformdirs==4.2.2 +protobuf==4.25.3 +pycparser==2.22 +pyelftools==0.31 pyserial==3.5 python3-protobuf==2.5.0 -PyYAML==6.0 -reedsolo==1.5.4 -requests==2.28.2 -schema==0.7.5 -SCons==4.6.0 -pyelftools==0.29 +PyYAML==6.0.1 +reedsolo==1.7.0 +requests==2.32.3 +schema==0.7.7 +SCons==4.7.0 six==1.16.0 -smmap==5.0.0 -urllib3==1.26.14 +smmap==5.0.1 +typing_extensions==4.12.2 +urllib3==2.2.2 diff --git a/linux/scripts/build-linux-flipper-tools.sh b/linux/scripts/build-linux-flipper-tools.sh index cf69b88..ea000fd 100644 --- a/linux/scripts/build-linux-flipper-tools.sh +++ b/linux/scripts/build-linux-flipper-tools.sh @@ -41,7 +41,7 @@ function build_clang_format() { mkdir -p "$LINUX_CONFIGURE_ROOT/clang-format"; pushd "$LINUX_CONFIGURE_ROOT/clang-format"; cmake -S \ - /toolchain/src/src/clang-format/llvm-17.0.6.src \ + /toolchain/src/src/clang-format/llvm-18.1.8.src \ -B build \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/windows/Dockerfile b/windows/Dockerfile index 8666ee9..8cb189c 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -31,7 +31,7 @@ RUN bash /toolchain/src/build-windows-gcc.sh FROM flipperzero-toolchain-windows-build-deps AS flipperzero-toolchain-windows-python RUN DEBIAN_FRONTEND=noninteractive dpkg --add-architecture i386 && apt update && apt -y install xvfb wine wine32 wine64 unzip -ADD https://www.python.org/ftp/python/3.11.2/python-3.11.2-amd64.exe /toolchain/src/src/archives +ADD https://www.python.org/ftp/python/3.12.4/python-3.12.4-amd64.exe /toolchain/src/src/archives ADD scripts/unpack-windows-python-wine.sh /toolchain/src/ RUN bash /toolchain/src/unpack-windows-python-wine.sh @@ -51,18 +51,18 @@ RUN rsync -azv /tmp/cmake-3.28.0-linux-x86_64/ /usr ADD https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-cpp-3.21.7.tar.gz /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-17.0.6.src.tar.xz /toolchain/src/src/archives/ +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-18.1.8.src.tar.xz /toolchain/src/src/archives/ RUN mkdir -p /toolchain/src/src/clang-format -RUN tar -xvf /toolchain/src/src/archives/llvm-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/clang-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/ -RUN mv /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang-17.0.6.src /toolchain/src/src/clang-format/llvm-17.0.6.src/tools/clang -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/cmake-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/cmake-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/cmake-17.0.6.src /toolchain/src/src/clang-format/cmake -ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/third-party-17.0.6.src.tar.xz /toolchain/src/src/archives/ -RUN tar -xvf /toolchain/src/src/archives/third-party-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/ -RUN mv /toolchain/src/src/clang-format/third-party-17.0.6.src /toolchain/src/src/clang-format/third-party +RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/ +RUN mv /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/clang-format/llvm-18.1.8.src/tools/clang +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/cmake-18.1.8.src /toolchain/src/src/clang-format/cmake +ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/third-party-18.1.8.src.tar.xz /toolchain/src/src/archives/ +RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format/ +RUN mv /toolchain/src/src/clang-format/third-party-18.1.8.src /toolchain/src/src/clang-format/third-party ADD https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2 /toolchain/src/src/archives/ RUN tar -xvf /toolchain/src/src/archives/libusb-1.0.24.tar.bz2 -C /toolchain/src/src/ diff --git a/windows/requirements.txt b/windows/requirements.txt index b88ae99..d5b442e 100644 --- a/windows/requirements.txt +++ b/windows/requirements.txt @@ -1,36 +1,39 @@ -ansi==0.3.6 -bitstring==3.1.9 -black==23.1.0 -certifi==2022.12.7 -cffi==1.15.1 -charset-normalizer==3.0.1 -click==8.1.3 -colorlog==6.7.0 +ansi==0.3.7 +bitarray==2.9.2 +bitstring==4.2.3 +black==24.4.2 +certifi==2024.6.2 +cffi==1.16.0 +charset-normalizer==3.3.2 +click==8.1.7 +colorlog==6.8.2 contextlib2==21.6.0 -cryptography==39.0.1 -dataclass-wizard==0.22.2 -ecdsa==0.18.0 -esptool==4.4 -gitdb==4.0.10 -GitPython==3.1.29 -heatshrink2==0.12.0 -idna==3.4 -lxml==4.9.2 +cryptography==42.0.8 +dataclass-wizard==0.22.3 +ecdsa==0.19.0 +esptool==4.7.0 +gitdb==4.0.11 +heatshrink2==0.13.0 +idna==3.7 +intelhex==2.3.0 +lxml==5.2.2 +mypy==1.10.1 mypy-extensions==1.0.0 -packaging==23.0 -pathspec==0.11.0 -Pillow==9.4.0 -platformdirs==3.0.0 -protobuf==4.21.12 -pycparser==2.21 +packaging==24.1 +pathspec==0.12.1 +pillow==10.4.0 +platformdirs==4.2.2 +protobuf==4.25.3 +pycparser==2.22 +pyelftools==0.31 pyserial==3.5 python3-protobuf==2.5.0 -PyYAML==6.0 -reedsolo==1.5.4 -requests==2.28.2 -schema==0.7.5 -SCons==4.6.0 -pyelftools==0.29 +PyYAML==6.0.1 +reedsolo==1.7.0 +requests==2.32.3 +schema==0.7.7 +SCons==4.7.0 six==1.16.0 -smmap==5.0.0 -urllib3==1.26.14 +smmap==5.0.1 +typing_extensions==4.12.2 +urllib3==2.2.2 diff --git a/windows/scripts/build-windows-flipper-tools.sh b/windows/scripts/build-windows-flipper-tools.sh index a88dca4..4db53d1 100644 --- a/windows/scripts/build-windows-flipper-tools.sh +++ b/windows/scripts/build-windows-flipper-tools.sh @@ -35,7 +35,7 @@ function build_clang_format() { mkdir -p "$WINDOWS_CONFIGURE_ROOT/clang-format"; pushd "$WINDOWS_CONFIGURE_ROOT/clang-format"; cmake -S \ - /toolchain/src/src/clang-format/llvm-17.0.6.src \ + /toolchain/src/src/clang-format/llvm-18.1.8.src \ -B build \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/windows/scripts/unpack-windows-python-wine.sh b/windows/scripts/unpack-windows-python-wine.sh index e1bd2d1..ffa4468 100755 --- a/windows/scripts/unpack-windows-python-wine.sh +++ b/windows/scripts/unpack-windows-python-wine.sh @@ -24,7 +24,7 @@ function setup_wine() { } function unpack_python() { pushd /toolchain/src/src/archives; - DISPLAY=:0.0 WINEARCH=win64 wine cmd /c python-3.11.2-amd64.exe /quiet PrependPath=1 InstallAllUsers=1 TargetDir=C:\\Python + DISPLAY=:0.0 WINEARCH=win64 wine cmd /c python-3.12.4-amd64.exe /quiet PrependPath=1 InstallAllUsers=1 TargetDir=C:\\Python popd; } function move_python_files() {