From 2cbf42629631dfd76c18f3feb1fe2cda7343f7d5 Mon Sep 17 00:00:00 2001 From: Dusty Daemon Date: Fri, 10 Nov 2023 15:55:52 -0500 Subject: [PATCH] make: always generate proto files sans rust MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Generating the msggen proto files doesn’t require rust (even though it generates rust files). Changelog-None --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5a5622fa9..d1792f2db 100644 --- a/Makefile +++ b/Makefile @@ -367,7 +367,8 @@ ifneq ($(FUZZING),0) endif ifneq ($(RUST),0) include cln-rpc/Makefile - include cln-grpc/Makefile +endif +include cln-grpc/Makefile $(MSGGEN_GENALL)&: contrib/msggen/msggen/schema.json PYTHONPATH=contrib/msggen $(PYTHON) contrib/msggen/msggen/__main__.py generate @@ -390,7 +391,6 @@ $(GRPC_GEN)&: cln-grpc/proto/node.proto cln-grpc/proto/primitives.proto $(PYTHON) -m grpc_tools.protoc -I cln-grpc/proto cln-grpc/proto/primitives.proto --python_out=$(GRPC_PATH)/ --experimental_allow_proto3_optional find $(GRPC_DIR)/ -type f -name "*.py" -print0 | xargs -0 sed -i'.bak' -e 's/^import \(.*\)_pb2 as .*__pb2/from pyln.grpc import \1_pb2 as \1__pb2/g' find $(GRPC_DIR)/ -type f -name "*.py.bak" -print0 | xargs -0 rm -f -endif # We make pretty much everything depend on these. ALL_GEN_HEADERS := $(filter %gen.h,$(ALL_C_HEADERS))