From a2a59f67518919d9a15c32d1924ce9795513f038 Mon Sep 17 00:00:00 2001 From: holmes1412 Date: Mon, 16 Aug 2021 20:26:40 +0800 Subject: [PATCH] update build directory for cmake --- BUILD | 295 ------------------------------------------- GNUmakefile | 10 +- test/GNUmakefile | 6 +- tutorial/GNUmakefile | 8 +- 4 files changed, 7 insertions(+), 312 deletions(-) delete mode 100644 BUILD diff --git a/BUILD b/BUILD deleted file mode 100644 index 69417b8b..00000000 --- a/BUILD +++ /dev/null @@ -1,295 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@rules_proto//proto:defs.bzl", "proto_library") -load(":srpc.bzl", "gen_srpc_pb_cc") -load(":srpc.bzl", "gen_srpc_thrift_cc") - -proto_library( - name = "message_proto", - srcs = [ - 'src/message/rpc_meta.proto', - 'src/message/rpc_meta_brpc.proto', - 'src/message/rpc_meta_trpc.proto', - 'src/message/rpc_span.proto', - ], - strip_import_prefix = "src/message", -) - -cc_proto_library( - name = "MessageProto", - deps = [":message_proto"], -) - -cc_library( - name = 'srpc_hdrs', - hdrs = glob(['src/include/srpc/*']), - includes = ['src/include'], - deps = [ - '@workflow//:workflow_hdrs', - ], - visibility = ["//visibility:public"], -) - -cc_library( - name = 'libsrpc', - srcs = glob(['src/**/*.cc']), - hdrs = glob([ - 'src/**/*.h', - 'src/**/*.inl', - ]), - includes = ['src', 'src/thrift', 'src/compress', 'src/message', 'src/module'], - deps = [ - '@workflow//:http', - '@workflow//:upstream', - '@lz4//:lz4', - '@snappy//:snappy', - ':MessageProto', - ], - visibility = ["//visibility:public"], -) - -cc_binary( - name ='srpc_generator', - srcs = glob(['src/generator/*.cc']), - deps = [':libsrpc'], -) - -proto_library( - name = "echo_pb_proto", - srcs = [ - 'tutorial/echo_pb.proto', - ], - strip_import_prefix = "tutorial", -) - -cc_proto_library( - name = "EchoProto", - deps = [":echo_pb_proto"], -) - -gen_srpc_pb_cc( - name = "echo_pb", - files = ["tutorial/echo_pb.proto",], - deps_lib = [':EchoProto'], -) - -cc_binary( - name = 'srpc_pb_server', - srcs = ['tutorial/tutorial-01-srpc_pb_server.cc'], - deps = [ - ':libsrpc', - ':echo_pb_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'srpc_pb_client', - srcs = ['tutorial/tutorial-02-srpc_pb_client.cc'], - deps = [ - ':libsrpc', - ':echo_pb_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -gen_srpc_thrift_cc( - name = "echo_thrift", - files = ["tutorial/echo_thrift.thrift",], - deps_lib = [], -) - -cc_binary( - name = 'srpc_thrift_server', - srcs = ['tutorial/tutorial-03-srpc_thrift_server.cc'], - deps = [ - ':libsrpc', - ':echo_thrift_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'srpc_thrift_client', - srcs = ['tutorial/tutorial-04-srpc_thrift_client.cc'], - deps = [ - ':libsrpc', - ':echo_thrift_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'brpc_pb_server', - srcs = ['tutorial/tutorial-05-brpc_pb_server.cc'], - deps = [ - ':libsrpc', - ':echo_pb_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'brpc_pb_client', - srcs = ['tutorial/tutorial-06-brpc_pb_client.cc'], - deps = [ - ':libsrpc', - ':echo_pb_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'thrift_thrift_server', - srcs = ['tutorial/tutorial-07-thrift_thrift_server.cc'], - deps = [ - ':libsrpc', - ':echo_thrift_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'thrift_thrift_client', - srcs = ['tutorial/tutorial-08-thrift_thrift_client.cc'], - deps = [ - ':libsrpc', - ':echo_thrift_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'client_task', - srcs = ['tutorial/tutorial-09-client_task.cc'], - deps = [ - ':libsrpc', - ':echo_pb_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'server_async', - srcs = ['tutorial/tutorial-10-server_async.cc'], - deps = [ - ':libsrpc', - ':echo_pb_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -proto_library( - name = "helloworld_proto", - srcs = [ - 'tutorial/helloworld.proto', - ], - strip_import_prefix = "tutorial", -) - -cc_proto_library( - name = "HelloworldProto", - deps = [":helloworld_proto"], -) - -gen_srpc_pb_cc( - name = "helloworld", - files = ["tutorial/helloworld.proto",], - deps_lib = [':HelloworldProto'], -) - -cc_binary( - name = 'trpc_pb_server', - srcs = ['tutorial/tutorial-11-trpc_pb_server.cc'], - deps = [ - ':libsrpc', - ':helloworld_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'trpc_pb_client', - srcs = ['tutorial/tutorial-12-trpc_pb_client.cc'], - deps = [ - ':libsrpc', - ':helloworld_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'trpc_http_server', - srcs = ['tutorial/tutorial-13-trpc_http_server.cc'], - deps = [ - ':libsrpc', - ':helloworld_server_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - -cc_binary( - name = 'trpc_http_client', - srcs = ['tutorial/tutorial-14-trpc_http_client.cc'], - deps = [ - ':libsrpc', - ':helloworld_client_cc', - ], - linkopts = [ - '-lpthread', - '-lssl', - '-lcrypto', - ], -) - diff --git a/GNUmakefile b/GNUmakefile index 3d690b6c..a5ef5c23 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,7 +2,7 @@ ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) ALL_TARGETS := all base check install preinstall package rpm clean tutorial example MAKE_FILE := Makefile -DEFAULT_BUILD_DIR := build +DEFAULT_BUILD_DIR := build.cmake BUILD_DIR := $(shell if [ -f $(MAKE_FILE) ]; then echo "."; else echo $(DEFAULT_BUILD_DIR); fi) CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake; fi;) @@ -25,9 +25,6 @@ endif tutorial: all make -C tutorial -example: all - make -C example - check: all make -C test check @@ -42,13 +39,8 @@ ifneq ($(BUILD_DIR),.) endif clean: -ifeq (build, $(wildcard build)) - -make -C build clean -endif -make -C workflow clean -make -C test clean - -make -C benchmark clean - -make -C example clean -make -C tutorial clean rm -rf $(DEFAULT_BUILD_DIR) rm -rf _include diff --git a/test/GNUmakefile b/test/GNUmakefile index 36af4e8a..ce64f252 100644 --- a/test/GNUmakefile +++ b/test/GNUmakefile @@ -2,7 +2,7 @@ ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) ALL_TARGETS := all check clean MAKE_FILE := Makefile -DEFAULT_BUILD_DIR := build +DEFAULT_BUILD_DIR := build.cmake BUILD_DIR := $(shell if [ -f $(MAKE_FILE) ]; then echo "."; else echo $(DEFAULT_BUILD_DIR); fi) CMAKE3 := $(shell if which cmake3 ; then echo cmake3; else echo cmake; fi;) @@ -27,8 +27,6 @@ check: clean: ifeq ($(MAKE_FILE), $(wildcard $(MAKE_FILE))) -make -f Makefile clean -else ifeq (build, $(wildcard build)) - -make -C build clean endif - rm -rf build + rm -rf $(DEFAULT_BUILD_DIR) diff --git a/tutorial/GNUmakefile b/tutorial/GNUmakefile index 5105fead..a860b3ce 100644 --- a/tutorial/GNUmakefile +++ b/tutorial/GNUmakefile @@ -2,7 +2,7 @@ ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) ALL_TARGETS := all clean MAKE_FILE := Makefile -DEFAULT_BUILD_DIR := build +DEFAULT_BUILD_DIR := build.cmake BUILD_DIR := $(shell if [ -f $(MAKE_FILE) ]; then echo "."; else echo $(DEFAULT_BUILD_DIR); fi) CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake; fi;) @@ -22,8 +22,8 @@ endif clean: ifeq ($(MAKE_FILE), $(wildcard $(MAKE_FILE))) -make -f Makefile clean -else ifeq (build, $(wildcard build)) - -make -C build clean +else ifeq ($(DEFAULT_BUILD_DIR), $(wildcard $(DEFAULT_BUILD_DIR))) + -make -C $(DEFAULT_BUILD_DIR) clean endif - rm -rf build + rm -rf $(DEFAULT_BUILD_DIR)