Skip to content

Commit 5b5ebff

Browse files
Mizuchifacebook-github-bot
Mizuchi
authored and
facebook-github-bot
committed
Migrate OSS project to handle protocol split
Summary: X-link: facebook/CacheLib#386 X-link: facebook/fb303#67 fbthrift has moved compact/binary protocol instantiation outside _types.cpp (to _types_compact.cpp and _types_binary.cpp). We need to add these two files to the build system. Differential Revision: D74687663
1 parent b8c4518 commit 5b5ebff

File tree

5 files changed

+38
-1
lines changed

5 files changed

+38
-1
lines changed

‎build/fbcode_builder/CMake/FBThriftCppLibrary.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)
6969
"${output_dir}/gen-cpp2/${base}_data.h"
7070
"${output_dir}/gen-cpp2/${base}_data.cpp"
7171
"${output_dir}/gen-cpp2/${base}_types.cpp"
72+
"${output_dir}/gen-cpp2/${base}_types_compact.cpp"
73+
"${output_dir}/gen-cpp2/${base}_types_binary.cpp"
7274
"${output_dir}/gen-cpp2/${base}_metadata.cpp"
7375
)
7476
foreach(service IN LISTS ARG_SERVICES)

‎third-party/mcrouter/src/mcrouter/lib/Makefile.am‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,15 @@ libmcrouter_a_SOURCES = \
9292
carbon/Util.h \
9393
carbon/Variant.h \
9494
carbon/gen-cpp2/carbon_result_types.cpp \
95+
carbon/gen-cpp2/carbon_result_types_compact.cpp \
96+
carbon/gen-cpp2/carbon_result_types_binary.cpp \
9597
carbon/gen-cpp2/carbon_result_types.h \
9698
carbon/gen-cpp2/carbon_result_types.tcc \
9799
carbon/gen-cpp2/carbon_result_data.cpp \
98100
carbon/gen-cpp2/carbon_result_data.h \
99101
carbon/gen-cpp2/carbon_types.cpp \
102+
carbon/gen-cpp2/carbon_types_compact.cpp \
103+
carbon/gen-cpp2/carbon_types_binary.cpp \
100104
carbon/gen-cpp2/carbon_types.h \
101105
carbon/gen-cpp2/carbon_types.tcc \
102106
carbon/gen-cpp2/carbon_data.cpp \
@@ -191,6 +195,8 @@ libmcrouter_a_SOURCES = \
191195
network/gen/MemcacheMessagesThrift.cpp \
192196
network/gen/MemcacheMessages.h \
193197
network/gen/gen-cpp2/Common_types.cpp \
198+
network/gen/gen-cpp2/Common_types_compact.cpp \
199+
network/gen/gen-cpp2/Common_types_binary.cpp \
194200
network/gen/gen-cpp2/Common_types.h \
195201
network/gen/gen-cpp2/Common_types.tcc \
196202
network/gen/gen-cpp2/Common_data.cpp \
@@ -200,11 +206,15 @@ libmcrouter_a_SOURCES = \
200206
network/gen/gen-cpp2/MemcacheService_constants.cpp \
201207
network/gen/gen-cpp2/MemcacheService_constants.h \
202208
network/gen/gen-cpp2/MemcacheService_types.cpp \
209+
network/gen/gen-cpp2/MemcacheService_types_compact.cpp \
210+
network/gen/gen-cpp2/MemcacheService_types_binary.cpp \
203211
network/gen/gen-cpp2/MemcacheService_types.h \
204212
network/gen/gen-cpp2/MemcacheService_types.tcc \
205213
network/gen/gen-cpp2/MemcacheService_data.cpp \
206214
network/gen/gen-cpp2/MemcacheService_data.h \
207215
network/gen/gen-cpp2/Memcache_types.cpp \
216+
network/gen/gen-cpp2/Memcache_types_compact.cpp \
217+
network/gen/gen-cpp2/Memcache_types_binary.cpp \
208218
network/gen/gen-cpp2/Memcache_types.h \
209219
network/gen/gen-cpp2/Memcache_types.tcc \
210220
network/gen/gen-cpp2/Memcache_data.cpp \

‎third-party/mcrouter/src/mcrouter/lib/carbon/Makefile.am‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@
55

66
BUILT_SOURCES = \
77
gen-cpp2/carbon_result_types.cpp \
8+
gen-cpp2/carbon_result_types_compact.cpp \
9+
gen-cpp2/carbon_result_types_binary.cpp \
810
gen-cpp2/carbon_result_types.h \
911
gen-cpp2/carbon_result_types.tcc \
1012
gen-cpp2/carbon_result_data.cpp \
1113
gen-cpp2/carbon_result_data.h \
1214
gen-cpp2/carbon_types.cpp \
15+
gen-cpp2/carbon_types_compact.cpp \
16+
gen-cpp2/carbon_types_binary.cpp \
1317
gen-cpp2/carbon_types.h \
1418
gen-cpp2/carbon_types.tcc \
1519
gen-cpp2/carbon_data.cpp \
1620
gen-cpp2/carbon_data.h
1721

1822
gen-cpp2/carbon_result_types.cpp: gen-cpp2/carbon_result_types.h
23+
gen-cpp2/carbon_result_types_compact.cpp: gen-cpp2/carbon_result_types.h
24+
gen-cpp2/carbon_result_types_binary.cpp: gen-cpp2/carbon_result_types.h
1925
gen-cpp2/carbon_result_types.h: gen-cpp2/carbon_result_types.tcc
2026
gen-cpp2/carbon_result_types.tcc: gen-cpp2/carbon_result_data.cpp
2127
gen-cpp2/carbon_result_data.cpp: gen-cpp2/carbon_result_data.h
2228
gen-cpp2/carbon_result_data.h: carbon_result.thrift
2329
@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,include_prefix=mcrouter/lib/carbon/ carbon_result.thrift
2430

2531
gen-cpp2/carbon_types.cpp: gen-cpp2/carbon_types.h
32+
gen-cpp2/carbon_types_compact.cpp: gen-cpp2/carbon_types.h
33+
gen-cpp2/carbon_types_binary.cpp: gen-cpp2/carbon_types.h
2634
gen-cpp2/carbon_types.h: gen-cpp2/carbon_types.tcc
2735
gen-cpp2/carbon_types.tcc: gen-cpp2/carbon_data.cpp
2836
gen-cpp2/carbon_data.cpp: gen-cpp2/carbon_data.h

‎third-party/mcrouter/src/mcrouter/lib/network/gen/Makefile.am‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55

66
BUILT_SOURCES = \
77
gen-cpp2/Common_types.cpp \
8+
gen-cpp2/Common_types_compact.cpp \
9+
gen-cpp2/Common_types_binary.cpp \
810
gen-cpp2/Common_types.h \
911
gen-cpp2/Common_types.tcc \
1012
gen-cpp2/Common_data.cpp \
1113
gen-cpp2/Common_data.h \
1214
gen-cpp2/Memcache_types.cpp \
15+
gen-cpp2/Memcache_types_compact.cpp \
16+
gen-cpp2/Memcache_types_binary.cpp \
1317
gen-cpp2/Memcache_types.h \
1418
gen-cpp2/Memcache_types.tcc \
1519
gen-cpp2/Memcache_data.cpp \
@@ -19,19 +23,25 @@ BUILT_SOURCES = \
1923
gen-cpp2/MemcacheService_constants.cpp \
2024
gen-cpp2/MemcacheService_constants.h \
2125
gen-cpp2/MemcacheService_types.cpp \
26+
gen-cpp2/MemcacheService_types_compact.cpp \
27+
gen-cpp2/MemcacheService_types_binary.cpp \
2228
gen-cpp2/MemcacheService_types.h \
2329
gen-cpp2/MemcacheService_types.tcc \
2430
gen-cpp2/MemcacheService_data.cpp \
2531
gen-cpp2/MemcacheService_data.h
2632

2733
gen-cpp2/Common_types.cpp: gen-cpp2/Common_types.h
34+
gen-cpp2/Common_types_compact.cpp: gen-cpp2/Common_types.h
35+
gen-cpp2/Common_types_binary.cpp: gen-cpp2/Common_types.h
2836
gen-cpp2/Common_types.h: gen-cpp2/Common_types.tcc
2937
gen-cpp2/Common_types.tcc: gen-cpp2/Common_data.cpp
3038
gen-cpp2/Common_data.cpp: gen-cpp2/Common_data.h
3139
gen-cpp2/Common_data.h: Common.thrift
3240
@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,deprecated_terse_writes,include_prefix=mcrouter/lib/network/gen -I $(top_srcdir)/.. -I $(INSTALL_DIR)/include/ Common.thrift
3341

3442
gen-cpp2/Memcache_types.cpp: gen-cpp2/Memcache_types.h
43+
gen-cpp2/Memcache_types_compact.cpp: gen-cpp2/Memcache_types.h
44+
gen-cpp2/Memcache_types_binary.cpp: gen-cpp2/Memcache_types.h
3545
gen-cpp2/Memcache_types.h: gen-cpp2/Memcache_types.tcc
3646
gen-cpp2/Memcache_types.tcc: gen-cpp2/Memcache_data.cpp
3747
gen-cpp2/Memcache_data.cpp: gen-cpp2/Memcache_data.h

‎third-party/thrift/src/thrift/lib/py/TSCons.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ def scons_env(env, add=""):
2828

2929
def gen_cpp(env, dir, file):
3030
scons_env(env)
31-
suffixes = ["_data.h", "_data.cpp", "_types.h", "_types.cpp"]
31+
suffixes = [
32+
"_data.h",
33+
"_data.cpp",
34+
"_types.h",
35+
"_types.cpp",
36+
"_types_compact.cpp",
37+
"_types_binary.cpp",
38+
]
3239
targets = ["gen-cpp" + file + s for s in suffixes]
3340
return env.ThriftCpp(targets, dir + file + ".thrift")

0 commit comments

Comments
 (0)