Add clangd, update python packages

flipperdevices · Jul 11, 2024 · 92bc2cc · 92bc2cc
1 parent 2d5fbf7
commit 92bc2cc
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 65 deletions.
diff --git a/darwin/Dockerfile b/darwin/Dockerfile
@@ -58,17 +58,20 @@ 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-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-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format
+RUN mkdir -p /toolchain/src/src/llvm
+RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/llvm
 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
+RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/llvm-18.1.8.src/tools/
+RUN mv /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/cmake-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/third-party-18.1.8.src /toolchain/src/src/llvm/third-party
+ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz /toolchain/src/src/archives/
+RUN tar -xvf /toolchain/src/src/archives/clang-tools-extra-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/clang-tools-extra-18.1.8.src /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang/tools/extra
 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
@@ -2,7 +2,8 @@ ansi==0.3.7
 bitarray==2.9.2
 bitstring==4.2.3
 black==24.4.2
-certifi==2024.6.2
+certifi==2024.07.04
+cxxheaderparser==1.3.3
 cffi==1.16.0
 charset-normalizer==3.3.2
 click==8.1.7

diff --git a/darwin/scripts/build-mac-flipper-tools.sh b/darwin/scripts/build-mac-flipper-tools.sh
@@ -76,22 +76,23 @@ function build_protobuf_arm64() {
     popd;
 }
 
-function build_clang_format_x86_64() {
-    rm -rf "$MAC_X86_64_CONFIGURE_ROOT/clang-format";
-    mkdir -p "$MAC_X86_64_CONFIGURE_ROOT/clang-format";
-    pushd "$MAC_X86_64_CONFIGURE_ROOT/clang-format";
+function build_llvm_x86_64() {
+    rm -rf "$MAC_X86_64_CONFIGURE_ROOT/llvm";
+    mkdir -p "$MAC_X86_64_CONFIGURE_ROOT/llvm";
+    pushd "$MAC_X86_64_CONFIGURE_ROOT/llvm";
     CPPFLAGS="$MAC_X86_64_FLAGS" \
         CXXFLAGS="$MAC_X86_64_FLAGS" \
         CFLAGS="$MAC_X86_64_FLAGS" \
         LDFLAGS="$MAC_X86_64_FLAGS" \
         cmake \
-            -S /toolchain/src/src/clang-format/llvm-18.1.8.src \
+            -S /toolchain/src/src/llvm/llvm-18.1.8.src \
             -B build \
             -DLLVM_INCLUDE_BENCHMARKS=OFF \
             -DCMAKE_BUILD_TYPE=Release \
             "-DCMAKE_INSTALL_PREFIX=$MAC_X86_64_OUTPUT_ROOT" \
-            -DLLVM_EXTERNAL_PROJECTS=clang \
-            -DCMAKE_OSX_ARCHITECTURES=x86_64;
+            "-DLLVM_EXTERNAL_PROJECTS=clang;clang-tools-extra" \
+            -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+            "-DLLVM_TARGETS_TO_BUILD=ARM";
     CPPFLAGS="$MAC_X86_64_FLAGS" \
         CXXFLAGS="$MAC_X86_64_FLAGS" \
         CFLAGS="$MAC_X86_64_FLAGS" \
@@ -102,29 +103,44 @@ function build_clang_format_x86_64() {
             "--target" \
             "clang-format" \
             "-j$CPUS";
+    CPPFLAGS="$MAC_X86_64_FLAGS" \
+        CXXFLAGS="$MAC_X86_64_FLAGS" \
+        CFLAGS="$MAC_X86_64_FLAGS" \
+        LDFLAGS="$MAC_X86_64_FLAGS"\
+        cmake \
+            "--build" \
+            "build" \
+            "--target" \
+            "clangd" \
+            "-j$CPUS";
     cmake \
         --install build \
         --strip \
         --component clang-format;
+    cmake \
+        --install build \
+        --strip \
+        --component clangd;
     popd;
 }
 
-function build_clang_format_arm64() {
-    rm -rf "$MAC_ARM64_CONFIGURE_ROOT/clang-format";
-    mkdir -p "$MAC_ARM64_CONFIGURE_ROOT/clang-format";
-    pushd "$MAC_ARM64_CONFIGURE_ROOT/clang-format";
+function build_llvm_arm64() {
+    rm -rf "$MAC_ARM64_CONFIGURE_ROOT/llvm";
+    mkdir -p "$MAC_ARM64_CONFIGURE_ROOT/llvm";
+    pushd "$MAC_ARM64_CONFIGURE_ROOT/llvm";
     CPPFLAGS="$MAC_ARM64_FLAGS" \
         CXXFLAGS="$MAC_ARM64_FLAGS" \
         CFLAGS="$MAC_ARM64_FLAGS" \
         LDFLAGS="$MAC_ARM64_FLAGS" \
         cmake \
-            -S /toolchain/src/src/clang-format/llvm-18.1.8.src \
+            -S /toolchain/src/src/llvm/llvm-18.1.8.src \
             -B build \
             -DLLVM_INCLUDE_BENCHMARKS=OFF \
             -DCMAKE_BUILD_TYPE=Release \
             "-DCMAKE_INSTALL_PREFIX=$MAC_ARM64_OUTPUT_ROOT" \
-            -DLLVM_EXTERNAL_PROJECTS=clang \
-            -DCMAKE_OSX_ARCHITECTURES=arm64;
+            "-DLLVM_EXTERNAL_PROJECTS=clang;clang-tools-extra" \
+            -DCMAKE_OSX_ARCHITECTURES=arm64 \
+            "-DLLVM_TARGETS_TO_BUILD=ARM";
     CPPFLAGS="$MAC_ARM64_FLAGS" \
         CXXFLAGS="$MAC_ARM64_FLAGS" \
         CFLAGS="$MAC_ARM64_FLAGS" \
@@ -135,10 +151,24 @@ function build_clang_format_arm64() {
             "--target" \
             "clang-format" \
             "-j$CPUS";
+    CPPFLAGS="$MAC_ARM64_FLAGS" \
+        CXXFLAGS="$MAC_ARM64_FLAGS" \
+        CFLAGS="$MAC_ARM64_FLAGS" \
+        LDFLAGS="$MAC_ARM64_FLAGS"\
+        cmake \
+            "--build" \
+            "build" \
+            "--target" \
+            "clangd" \
+            "-j$CPUS";
     cmake \
         --install build \
         --strip \
         --component clang-format;
+    cmake \
+        --install build \
+        --strip \
+        --component clangd;
     popd;
 }
 
@@ -352,8 +382,8 @@ function build_openocd_arm64() {
 
 build_protobuf_x86_64;
 build_protobuf_arm64;
-build_clang_format_x86_64;
-build_clang_format_arm64;
+build_llvm_x86_64;
+build_llvm_arm64;
 build_libusb_x86_64;
 build_libusb_arm64;
 build_hidapi_x86_64;

diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64
@@ -84,17 +84,20 @@ RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchai
 RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf
 
 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-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format
+RUN mkdir -p /toolchain/src/src/llvm
+RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/llvm
 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
+RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/llvm-18.1.8.src/tools/
+RUN mv /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/cmake-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/third-party-18.1.8.src /toolchain/src/src/llvm/third-party
+ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz /toolchain/src/src/archives/
+RUN tar -xvf /toolchain/src/src/archives/clang-tools-extra-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/clang-tools-extra-18.1.8.src /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang/tools/extra
 
 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
@@ -84,17 +84,20 @@ RUN tar -xvf /toolchain/src/src/archives/protobuf-cpp-3.21.7.tar.gz -C /toolchai
 RUN mv /toolchain/src/src/protobuf-3.21.7 /toolchain/src/src/protobuf
 
 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-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format
+RUN mkdir -p /toolchain/src/src/llvm
+RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/llvm
 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
+RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/llvm-18.1.8.src/tools/
+RUN mv /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/cmake-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/third-party-18.1.8.src /toolchain/src/src/llvm/third-party
+ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz /toolchain/src/src/archives/
+RUN tar -xvf /toolchain/src/src/archives/clang-tools-extra-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/clang-tools-extra-18.1.8.src /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang/tools/extra
 
 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
@@ -2,7 +2,8 @@ ansi==0.3.7
 bitarray==2.9.2
 bitstring==4.2.3
 black==24.4.2
-certifi==2024.6.2
+certifi==2024.07.04
+cxxheaderparser==1.3.3
 cffi==1.16.0
 charset-normalizer==3.3.2
 click==8.1.7

diff --git a/linux/scripts/build-linux-flipper-tools.sh b/linux/scripts/build-linux-flipper-tools.sh
@@ -36,25 +36,34 @@ function build_protobuf() {
     cleanup_relink "$LINUX_OUTPUT_ROOT";
 }
 
-function build_clang_format() {
-    rm -rf "$LINUX_CONFIGURE_ROOT/clang-format";
-    mkdir -p "$LINUX_CONFIGURE_ROOT/clang-format";
-    pushd "$LINUX_CONFIGURE_ROOT/clang-format";
+function build_llvm() {
+    rm -rf "$LINUX_CONFIGURE_ROOT/llvm";
+    mkdir -p "$LINUX_CONFIGURE_ROOT/llvm";
+    pushd "$LINUX_CONFIGURE_ROOT/llvm";
     cmake -S \
-        /toolchain/src/src/clang-format/llvm-18.1.8.src \
+        /toolchain/src/src/llvm/llvm-18.1.8.src \
         -B build \
         -DLLVM_INCLUDE_BENCHMARKS=OFF \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="$LINUX_OUTPUT_ROOT" \
-        -DLLVM_EXTERNAL_PROJECTS=clang;
+        "-DLLVM_EXTERNAL_PROJECTS=clang;clang-tools-extra" \
+        "-DLLVM_TARGETS_TO_BUILD=ARM";
     cmake \
         --build build \
         --target clang-format \
         "-j$CPUS";
+    cmake \
+        --build build \
+        --target clangd \
+        "-j$CPUS";
     cmake \
         --install build \
         --strip \
         --component clang-format;
+    cmake \
+        --install build \
+        --strip \
+        --component clangd;
     popd;
 }
 
@@ -126,7 +135,7 @@ function build_openocd() {
 }
 
 build_protobuf;
-build_clang_format;
+build_llvm;
 copy_libudev;
 build_libusb;
 build_hidapi;

diff --git a/windows/Dockerfile b/windows/Dockerfile
@@ -52,17 +52,20 @@ 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-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-18.1.8.src.tar.xz -C /toolchain/src/src/clang-format
+RUN mkdir -p /toolchain/src/src/llvm
+RUN tar -xvf /toolchain/src/src/archives/llvm-18.1.8.src.tar.xz -C /toolchain/src/src/llvm
 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
+RUN tar -xvf /toolchain/src/src/archives/clang-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/llvm-18.1.8.src/tools/
+RUN mv /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/cmake-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/cmake-18.1.8.src /toolchain/src/src/llvm/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
+RUN tar -xvf /toolchain/src/src/archives/third-party-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/third-party-18.1.8.src /toolchain/src/src/llvm/third-party
+ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang-tools-extra-18.1.8.src.tar.xz /toolchain/src/src/archives/
+RUN tar -xvf /toolchain/src/src/archives/clang-tools-extra-18.1.8.src.tar.xz -C /toolchain/src/src/llvm/
+RUN mv /toolchain/src/src/llvm/clang-tools-extra-18.1.8.src /toolchain/src/src/llvm/llvm-18.1.8.src/tools/clang/tools/extra
 
 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
@@ -2,7 +2,8 @@ ansi==0.3.7
 bitarray==2.9.2
 bitstring==4.2.3
 black==24.4.2
-certifi==2024.6.2
+certifi==2024.07.04
+cxxheaderparser==1.3.3
 cffi==1.16.0
 charset-normalizer==3.3.2
 click==8.1.7

diff --git a/windows/scripts/build-windows-flipper-tools.sh b/windows/scripts/build-windows-flipper-tools.sh
@@ -30,17 +30,18 @@ function build_protobuf() {
     popd;
 }
 
-function build_clang_format() {
-    rm -rf "$WINDOWS_CONFIGURE_ROOT/clang-format";
-    mkdir -p "$WINDOWS_CONFIGURE_ROOT/clang-format";
-    pushd "$WINDOWS_CONFIGURE_ROOT/clang-format";
+function build_llvm() {
+    rm -rf "$WINDOWS_CONFIGURE_ROOT/llvm";
+    mkdir -p "$WINDOWS_CONFIGURE_ROOT/llvm";
+    pushd "$WINDOWS_CONFIGURE_ROOT/llvm";
     cmake -S \
-        /toolchain/src/src/clang-format/llvm-18.1.8.src \
+        /toolchain/src/src/llvm/llvm-18.1.8.src \
         -B build \
         -DLLVM_INCLUDE_BENCHMARKS=OFF \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="$WINDOWS_OUTPUT_ROOT" \
-        -DLLVM_EXTERNAL_PROJECTS=clang \
+        "-DLLVM_EXTERNAL_PROJECTS=clang;clang-tools-extra" \
+        "-DLLVM_TARGETS_TO_BUILD=ARM" \
         -DCMAKE_SYSTEM_NAME=Windows \
         -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres \
         -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
@@ -55,10 +56,18 @@ function build_clang_format() {
         --build build \
         --target clang-format \
         "-j$CPUS";
+    cmake \
+        --build build \
+        --target clangd \
+        "-j$CPUS";
     cmake \
         --install build \
         --strip \
         --component clang-format;
+    cmake \
+        --install build \
+        --strip \
+        --component clangd;
 }
 
 function build_libusb() {
@@ -144,7 +153,7 @@ function cleanup() {
 }
 
 build_protobuf;
-build_clang_format;
+build_llvm;
 build_libusb;
 build_hidapi;
 build_openocd;