Merge branch 'main' into v2

acoustid · Feb 25, 2024 · 3669e13 · 3669e13
2 parents c4ed3e8 + b85d96d
commit 3669e13
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 12,158 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y qtbase5-dev libgtest-dev
+        sudo apt-get install -y qt6-base-dev libgtest-dev libgrpc++-dev protobuf-compiler-grpc protobuf-compiler libsqlite3-dev
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,5 @@ install_manifest.txt
 moc_*.cpp
 moc_*.cpp_parameters
 *_autogen
+/src/server/grpc/proto/**/*.cc
+/src/server/grpc/proto/**/*.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,6 +147,40 @@ set(fpserver_SOURCES
 add_library(fpserverlib ${fpserver_SOURCES})
 target_link_libraries(fpserverlib fpindexlib qhttp PkgConfig::GRPCPP PkgConfig::PROTOBUF)
 
+add_custom_command(
+    COMMAND
+        protoc
+          -Isrc/server/grpc/proto
+	  --cpp_out=src/server/grpc/proto
+	  --grpc_out=src/server/grpc/proto
+          --plugin=protoc-gen-grpc=/usr/bin/grpc_cpp_plugin
+	  src/server/grpc/proto/index.proto
+    OUTPUT
+      src/server/grpc/proto/index.pb.h
+      src/server/grpc/proto/index.pb.cc
+      src/server/grpc/proto/index.grpc.pb.h
+      src/server/grpc/proto/index.grpc.pb.cc
+    DEPENDS
+      src/server/grpc/proto/index.proto
+)
+
+add_custom_command(
+    COMMAND
+	protoc
+	  -Isrc/server/grpc/proto
+	  --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/server/grpc/proto
+	  src/server/grpc/proto/google/api/annotations.proto
+	  src/server/grpc/proto/google/api/http.proto
+    OUTPUT
+      src/server/grpc/proto/google/api/annotations.pb.h
+      src/server/grpc/proto/google/api/annotations.pb.cc
+      src/server/grpc/proto/google/api/http.pb.h
+      src/server/grpc/proto/google/api/http.pb.cc
+    DEPENDS
+      src/server/grpc/proto/google/api/annotations.proto
+      src/server/grpc/proto/google/api/http.proto
+)
+
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/src
 	${CMAKE_CURRENT_SOURCE_DIR}/src/server/grpc/proto

diff --git a/src/server/grpc/proto/index.grpc.pb.cc b/src/server/grpc/proto/index.grpc.pb.cc
diff --git a/src/server/grpc/proto/index.grpc.pb.h b/src/server/grpc/proto/index.grpc.pb.h