Skip to content

Commit a7ab6ef

Browse files
build: enable Protocol Buffers v32 experimental editions support
- Add version check for protoc >= 32 to enable experimental editions flag - Update Makefile to conditionally include --experimental_editions based on protoc version - Maintain backward compatibility for older protoc versions
1 parent 7a0c96c commit a7ab6ef

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

proto/Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1+
# Version 32 enabled edition 2024
2+
# https://github.com/protocolbuffers/protobuf/releases/tag/v32.0
3+
PROTOC_MIN_2024 := 32
4+
PROTOC_MAJOR_VER ?= $(shell python3 -m grpc_tools.protoc --version | cut -d' ' -f2 | cut -d. -f1)
5+
6+
ifeq ($(shell [ $(PROTOC_MAJOR_VER) -ge $(PROTOC_MIN_2024) ] && echo pass),pass)
7+
EXPERIMENTAL_EDITIONS := --experimental_editions
8+
else
9+
EXPERIMENTAL_EDITIONS :=
10+
endif
11+
112
all: ../daemon/ui/protocol/ui.pb.go ../ui/opensnitch/ui_pb2.py
213

314
../daemon/ui/protocol/ui.pb.go: ui.proto
415
protoc -I. ui.proto --go_out=../daemon/ui/protocol/ --go-grpc_out=../daemon/ui/protocol/ --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative
516

617
../ui/opensnitch/ui_pb2.py: ui.proto
7-
python3 -m grpc_tools.protoc -I. --python_out=../ui/opensnitch/proto/ --grpc_python_out=../ui/opensnitch/proto/ ui.proto
18+
python3 -m grpc_tools.protoc $(EXPERIMENTAL_EDITIONS) -I. --python_out=../ui/opensnitch/proto/ --grpc_python_out=../ui/opensnitch/proto/ ui.proto
819

920
clean:
1021
@rm -rf ../daemon/ui/protocol/ui.pb.go

0 commit comments

Comments
 (0)