diff --git a/cpp/Makefile b/cpp/Makefile index aeb255c..39818f6 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -9,10 +9,12 @@ build: mkdir -p build && cd build && \ conan install .. --build=missing && \ conan build .. + debug: mkdir -p build && cd build && \ conan install .. --build=missing -s build_type=Debug && \ conan build .. + clean: rm -rf build @@ -34,3 +36,6 @@ check-tidy: fix-tidy: python3 ./scripts/run-clang-tidy.py -fix -p build/Release + +proto: + protoc -I="src/proto" --cpp_out="src/proto" src/proto/*.proto diff --git a/go/Makefile b/go/Makefile index 2857279..ef7cf60 100644 --- a/go/Makefile +++ b/go/Makefile @@ -1,39 +1,9 @@ .EXPORT_ALL_VARIABLES: +.PHONY: proto -define HELP_INFO -Usage: - make - -Target: - all build all executables (default) - protos compile server protobuf files - prepare prepare dependencies - clean clean artifacts -endef - - -.PHONY: all -all: prepare\ - protos \ - -.PHONY: prepare -prepare: - go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest - go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest - - -.PHONY: protos -protos: - $(MAKE) -C proto/mainfest - $(MAKE) -C proto/scheme - -.PHONY: clean-protos -clean-protos: - $(MAKE) -C proto/mainfest clean - $(MAKE) -C proto/scheme clean - - -.PHONY: clean -clean: clean-protos \ +proto: + mkdir -p proto/manifest_proto + mkdir -p proto/schema_proto + protoc -I="proto" --go_out=paths=source_relative:./proto/manifest_proto proto/manifest.proto + protoc -I="proto" --go_out=paths=source_relative:./proto/schema_proto proto/storage_schema.proto diff --git a/go/proto/manifest.proto b/go/proto/manifest.proto index 69d5409..d9ce34c 100644 --- a/go/proto/manifest.proto +++ b/go/proto/manifest.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -import "schema.proto"; +import "storage_schema.proto"; package manifest_proto; option go_package = "github.com/milvus-io/milvus-storage/go/proto/manifest_proto";