Upgrade nanopb to prevent it using system protobuf (#117)

ShrapnelDSP · Jun 26, 2024 · d0204b5 · d0204b5
1 parent 28a970f
commit d0204b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Setup ESP-IDF and build
       run: |
         . $IDF_PATH/export.sh
-        python3 -m pip install -r thirdparty/esp-idf-components/nanopb/requirements.txt
+        python3 -m pip install -r thirdparty/esp-idf-components/nanopb/nanopb/requirements.txt
         idf.py -C firmware build
 
     - name: ccache statistics
@@ -73,7 +73,7 @@ jobs:
       run: ccache --zero-stats
 
     - name: Install python dependencies
-      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/requirements.txt
+      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/nanopb/requirements.txt
 
     - name: Configure CMake
       run: cmake -B build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} plugins/${{matrix.plugin}}
@@ -107,7 +107,7 @@ jobs:
       run: ccache --zero-stats
 
     - name: Install python dependencies
-      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/requirements.txt
+      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/nanopb/requirements.txt
 
     - name: Configure CMake
       env:
@@ -170,7 +170,7 @@ jobs:
       run: ccache --zero-stats
 
     - name: Install python dependencies
-      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/requirements.txt
+      run: python3 -m pip install -r thirdparty/esp-idf-components/nanopb/nanopb/requirements.txt
 
     - name: Configure CMake
       env:

diff --git a/thirdparty/esp-idf-components/nanopb/nanopb b/thirdparty/esp-idf-components/nanopb/nanopb
diff --git a/thirdparty/esp-idf-components/nanopb/requirements.txt b/thirdparty/esp-idf-components/nanopb/requirements.txt
+1 −0		.bazelignore
+3 −0		.gitattributes
+2 −2		.github/workflows/bazel.yml
+14 −5		.github/workflows/binary_packages.yml
+28 −10		BUILD.bazel
+2 −1		CMakeLists.txt
+38 −0		MODULE.bazel
+2,509 −0		MODULE.bazel.lock
+2 −1		Package.swift
+1 −0		README.md
+0 −22		WORKSPACE
+12 −0		build-tests/cmake_with_components/CMakeLists.txt
+70 −0		build-tests/cmake_with_components/simple.cpp
+9 −0		build-tests/cmake_with_components/simple.proto
+15 −0		build-tests/legacy_cmake_relpath/CMakeLists.txt
+11 −0		build-tests/legacy_cmake_relpath/proto/simple.proto
+5 −0		build-tests/legacy_cmake_relpath/proto/sub/unlucky.proto
+73 −0		build-tests/legacy_cmake_relpath/simple.c
+13 −0		build-tests/legacy_cmake_simple/CMakeLists.txt
+71 −0		build-tests/legacy_cmake_simple/simple.c
+9 −0		build-tests/legacy_cmake_simple/simple.proto
+8 −22		docs/bazel_build.md
+66 −0		docs/migration.md
+3 −5		examples/cmake_relpath/CMakeLists.txt
+3 −4		examples/cmake_simple/CMakeLists.txt
+95 −19		extra/FindNanopb.cmake
+2 −2		extra/bazel/nanopb_cc_proto_library.bzl
+24 −11		extra/bazel/nanopb_deps.bzl
+2 −2		extra/bazel/python_deps.bzl
+2 −2		extra/requirements_lock.txt
+21 −5		generator/nanopb_generator.py
+1 −1		generator/platformio_generator.py
+26 −26		generator/proto/__init__.py
+7 −2		generator/proto/_utils.py
+5 −0		generator/proto/nanopb.proto
+13 −8		pb.h
+6 −5		pb_decode.c
+6 −5		pb_encode.c
+15 −0		spm_resources/PrivacyInfo.xcprivacy
+1 −1		tests/SConstruct
+1 −1		tests/cxx_descriptor/SConscript
+22 −0		tests/cxx_descriptor/message.proto
+11 −0		tests/cxx_descriptor/message_descriptor.cc
+2 −0		tests/options/proto3_options.expected
+1 −0		tests/options/proto3_options.proto
+2 −2		tests/regression/issue_485/uint8.expected
+2 −2		tests/regression/issue_838/enum_to_string.cxx
+2 −2		tools/make_linux_package.sh
+2 −2		tools/make_mac_package.sh
+4 −0		zephyr/module.yml