grpc
/
grpc-web
mirror of https://github.com/grpc/grpc-web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to GRPC master/head. Fix the make file to allow using GRPC 

internal headers.
This commit is contained in:
Feng Li 2017-03-01 14:59:30 -08:00
parent 9d2a960b3f
commit 8e12c2208c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -6,6 +6,7 @@ PROTO_SRC := $(ROOT_DIR)/third_party/grpc/third_party/protobuf/src
PROTO_LIB := $(PROTO_SRC)/.libs PROTO_LIB := $(PROTO_SRC)/.libs
PROTOC := $(PROTO_SRC)/protoc PROTOC := $(PROTO_SRC)/protoc
GRPC_INC := $(ROOT_DIR)/third_party/grpc/include GRPC_INC := $(ROOT_DIR)/third_party/grpc/include
GRPC_SRC := $(ROOT_DIR)/third_party/grpc
GRPC_LIB := $(ROOT_DIR)/third_party/grpc/libs/opt GRPC_LIB := $(ROOT_DIR)/third_party/grpc/libs/opt
all: clean package package_static all: clean package package_static
@ -41,7 +42,7 @@ nginx_config:
--with-http_ssl_module \ --with-http_ssl_module \
--with-http_v2_module \ --with-http_v2_module \
--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \ --with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \
-I $(GRPC_INC)" \ -I $(GRPC_INC) -I $(GRPC_SRC)" \
--with-ld-opt="$(NGINX_LD_OPT)" \ --with-ld-opt="$(NGINX_LD_OPT)" \
--with-openssl="$(ROOT_DIR)/third_party/openssl" \ --with-openssl="$(ROOT_DIR)/third_party/openssl" \
--add-module="$(ROOT_DIR)/net/grpc/gateway/nginx" --add-module="$(ROOT_DIR)/net/grpc/gateway/nginx"
@ -52,7 +53,7 @@ nginx_config_static:
--with-http_ssl_module \ --with-http_ssl_module \
--with-http_v2_module \ --with-http_v2_module \
--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \ --with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \
-I $(GRPC_INC)" \ -I $(GRPC_INC) -I $(GRPC_SRC)" \
--with-ld-opt="$(NGINX_STATIC_LD_OPT)" \ --with-ld-opt="$(NGINX_STATIC_LD_OPT)" \
--with-openssl="$(ROOT_DIR)/third_party/openssl" \ --with-openssl="$(ROOT_DIR)/third_party/openssl" \
--add-module="$(ROOT_DIR)/net/grpc/gateway/nginx" --add-module="$(ROOT_DIR)/net/grpc/gateway/nginx"

2
init_submodules.sh
View File

@ -1,4 +1,4 @@
git submodule update --init git submodule update --init
cd third_party/closure-library && git checkout tags/v20160911 -f && cd ../.. cd third_party/closure-library && git checkout tags/v20160911 -f && cd ../..
cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../.. cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../..
cd third_party/grpc && git checkout tags/v1.1.0-pre1 -f && git submodule update --init && cd ../.. cd third_party/grpc && git checkout master -f && git submodule update --init && cd ../..