Skip to content

Commit

Permalink
remove protobuf dependency (OpenAtomFoundation#178)
Browse files Browse the repository at this point in the history
modified:   Makefile
	modified:   third/pink
  • Loading branch information
zts1993 authored and KernelMaker committed Aug 29, 2017
1 parent a476665 commit d357c88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ $(SLASH):
$(AM_V_at)make -C $(SLASH_PATH)/slash/ DEBUG_LEVEL=$(DEBUG_LEVEL)

$(PINK):
$(AM_V_at)make -C $(PINK_PATH)/pink/ DEBUG_LEVEL=$(DEBUG_LEVEL) SLASH_PATH=$(SLASH_PATH)
$(AM_V_at)make -C $(PINK_PATH)/pink/ DEBUG_LEVEL=$(DEBUG_LEVEL) NO_PB=1 SLASH_PATH=$(SLASH_PATH)

$(ROCKSDB):
$(AM_V_at)make -j $(PROCESSOR_NUMS) -C $(ROCKSDB_PATH)/ static_lib DISABLE_JEMALLOC=1 DEBUG_LEVEL=$(DEBUG_LEVEL)
Expand Down
2 changes: 1 addition & 1 deletion third/pink
Submodule pink updated 47 files
+2 −1 .gitignore
+2 −2 README.md
+22 −58 pink/Makefile
+32 −26 pink/examples/Makefile
+2 −0 pink/examples/README.md
+130 −0 pink/examples/myredis_srv.cc
+24 −4 pink/examples/performance/Makefile
+4 −4 pink/include/bg_thread.h
+4 −1 pink/include/build_version.h
+3 −4 pink/include/http_conn.h
+4 −10 pink/include/pb_conn.h
+3 −4 pink/include/period_thread.h
+12 −4 pink/include/pink_cli.h
+15 −12 pink/include/pink_conn.h
+7 −7 pink/include/pink_define.h
+7 −7 pink/include/pink_thread.h
+5 −7 pink/include/redis_conn.h
+7 −7 pink/include/server_thread.h
+16 −9 pink/include/simple_http_conn.h
+0 −14 pink/include/version.h
+6 −4 pink/src/bg_thread.cc
+1 −1 pink/src/build_version.cc.in
+24 −8 pink/src/dispatch_thread.cc
+9 −9 pink/src/dispatch_thread.h
+11 −2 pink/src/holy_thread.cc
+6 −6 pink/src/holy_thread.h
+15 −9 pink/src/http_conn.cc
+8 −6 pink/src/pb_cli.cc
+5 −4 pink/src/pb_conn.cc
+26 −18 pink/src/pink_cli.cc
+3 −1 pink/src/pink_conn.cc
+4 −2 pink/src/pink_epoll.cc
+5 −8 pink/src/pink_epoll.h
+0 −21 pink/src/pink_item.cc
+12 −15 pink/src/pink_item.h
+2 −3 pink/src/pink_util.cc
+5 −4 pink/src/pink_util.h
+35 −33 pink/src/redis_cli.cc
+51 −43 pink/src/redis_conn.cc
+12 −11 pink/src/server_socket.cc
+3 −1 pink/src/server_socket.h
+21 −12 pink/src/server_thread.cc
+15 −13 pink/src/simple_http_conn.cc
+5 −0 pink/src/test/pink_thread_test.cc
+26 −14 pink/src/worker_thread.cc
+6 −7 pink/src/worker_thread.h
+20 −8 pink/test/Makefile

0 comments on commit d357c88

Please sign in to comment.