Use built-in protoc to generate the pb file (milvus-io#51)

Signed-off-by: SimFG <[email protected]>

Signed-off-by: SimFG <[email protected]>

Author: SimFG

Makefile

@@ -6,19 +6,10 @@ PROTOC_VER := $(shell protoc --version)
 
 all: generate-proto
 
-check-protoc:
-ifeq (, $(shell which protoc))
-	$(error "No protoc in PATH, consider doing apt-get install protoc")
-else
-	@echo "using $(shell which protoc)"
-endif
-
-check-protoc-version: check-protoc
-	@(env bash $(PWD)/scripts/check_protoc_version.sh)
-
 build:
 	@(env bash $(PWD)/scripts/core_build.sh)
 
-generate-proto: check-protoc-version build
-	@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && go get github.com/golang/protobuf/[email protected])
+generate-proto: export protoc:=${PWD}/cmake-build/protobuf/protobuf-build/protoc
+generate-proto: build
+	@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && go install github.com/golang/protobuf/[email protected])
 	@(env bash $(PWD)/scripts/proto_gen_go.sh)

cmake/CMakeLists.txt

@@ -5,6 +5,8 @@ include(FetchContent)
 
 message( STATUS "source dir ${PROJECT_SOURCE_DIR}" )
 
+set( THIRDPARTY_DOWNLOAD_PATH ${PROJECT_SOURCE_DIR}/3rdparty_download/download )
+
 add_subdirectory( protobuf )
 
 add_custom_target( Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean )

cmake/protobuf/CMakeLists.txt

@@ -6,9 +6,20 @@ message( STATUS "Building protobuf-cpp-3.9.0 from source" )
 FetchContent_Declare( protobuf
     URL             ${PROTOBUF_SOURCE_URL}
     URL_MD5         "9562b27cc6ac5ebd087f201f1310c885"
-    DOWNLOAD_DIR    ${THIRDPARTY_DOWNLOAD_PATH}
+    DOWNLOAD_DIR    ${CMAKE_CURRENT_BINARY_DIR}/../3rdparty_download
     SOURCE_DIR      ${CMAKE_CURRENT_BINARY_DIR}/protobuf-src
     BINARY_DIR      ${CMAKE_CURRENT_BINARY_DIR}/protobuf-build
 )
 
-FetchContent_MakeAvailable(protobuf)
+set( protobuf_BUILD_TESTS CACHE BOOL OFF FORCE )
+set( protobuf_WITH_ZLIB CACHE BOOL OFF FORCE )
+if ( NOT protobuf_POPULATED )
+    FetchContent_Populate( protobuf )
+
+    # Adding the following targets:
+    # protobuf::libprotobuf - static target
+    # protobuf::protoc - executable target
+    add_subdirectory( ${protobuf_SOURCE_DIR}/cmake
+                      ${protobuf_BINARY_DIR}
+                      EXCLUDE_FROM_ALL )
+endif()

scripts/check_protoc_version.sh

@@ -7,4 +7,21 @@ BUILD_OUTPUT_DIR="${SCRIPTS_DIR}/../cmake-build"
 mkdir -p ${BUILD_OUTPUT_DIR}
 pushd ${BUILD_OUTPUT_DIR}
 cmake ${CMAKE_DIR}
+
+if [[ ! ${jobs+1} ]]; then
+    if command -v nproc &> /dev/null
+    # For linux
+    then
+        jobs=$(nproc)
+    elif command -v sysctl &> /dev/null
+    # For macOS
+    then
+        jobs=$(sysctl -n hw.logicalcpu)
+    else
+        jobs=4
+    fi
+fi
+
+make -j ${jobs} protoc
+make -j ${jobs} install/local
 popd

scripts/core_build.sh

@@ -39,19 +39,21 @@ mkdir -p ../go-api/commonpb
 mkdir -p ../go-api/schemapb
 mkdir -p ../go-api/milvuspb
 
-protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
+$protoc --version
+
+$protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
     --go_opt="Mmilvus.proto=github.com/milvus-io/milvus-proto/go-api/milvuspb;milvuspb" \
     --go_opt=Mcommon.proto=github.com/milvus-io/milvus-proto/go-api/commonpb \
     --go_opt=Mschema.proto=github.com/milvus-io/milvus-proto/go-api/schemapb \
     --go_out=plugins=grpc,paths=source_relative:./../go-api/milvuspb milvus.proto
 
-protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
+$protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
     --go_opt=Mmilvus.proto=github.com/milvus-io/milvus-proto/go-api/milvuspb \
     --go_opt=Mcommon.proto=github.com/milvus-io/milvus-proto/go-api/commonpb \
     --go_opt="Mschema.proto=github.com/milvus-io/milvus-proto/go-api/schemapb;schemapb" \
     --go_out=plugins=grpc,paths=source_relative:./../go-api/schemapb schema.proto
 
-protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
+$protoc --proto_path="${GOOGLE_PROTO_DIR}" --proto_path=. \
     --go_opt=Mmilvus.proto=github.com/milvus-io/milvus-proto/go-api/milvuspb \
     --go_opt="Mcommon.proto=github.com/milvus-io/milvus-proto/go-api/commonpb;commonpb" \
     --go_opt=Mschema.proto=github.com/milvus-io/milvus-proto/go-api/schemapb \