From b7527af9e996716295e9d1ec1b43620344302adf Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 24 Jun 2020 18:41:37 +0800 Subject: [PATCH] 1 --- server/masterserver/CMakeLists.txt | 6 +++++- server/masterserver/cs_msgid.pb.cc | 1 - server/masterserver/cs_msgid.pb.h | 1 - server/masterserver/cs_proto.pb.cc | 1 - server/masterserver/cs_proto.pb.h | 1 - server/masterserver/ss_msgid.pb.cc | 1 - server/masterserver/ss_msgid.pb.h | 1 - server/masterserver/ss_proto.pb.cc | 1 - server/masterserver/ss_proto.pb.h | 1 - 9 files changed, 5 insertions(+), 9 deletions(-) delete mode 120000 server/masterserver/cs_msgid.pb.cc delete mode 120000 server/masterserver/cs_msgid.pb.h delete mode 120000 server/masterserver/cs_proto.pb.cc delete mode 120000 server/masterserver/cs_proto.pb.h delete mode 120000 server/masterserver/ss_msgid.pb.cc delete mode 120000 server/masterserver/ss_msgid.pb.h delete mode 120000 server/masterserver/ss_proto.pb.cc delete mode 120000 server/masterserver/ss_proto.pb.h diff --git a/server/masterserver/CMakeLists.txt b/server/masterserver/CMakeLists.txt index a7f419d..c5bed35 100644 --- a/server/masterserver/CMakeLists.txt +++ b/server/masterserver/CMakeLists.txt @@ -55,6 +55,10 @@ execute_process( COMMAND touch -a ss_proto.pb.cc COMMAND touch -a ss_msgid.pb.h COMMAND touch -a ss_msgid.pb.cc + COMMAND touch -a cs_proto.pb.h + COMMAND touch -a cs_proto.pb.cc + COMMAND touch -a cs_msgid.pb.h + COMMAND touch -a cs_msgid.pb.cc ) aux_source_directory(. SRC_LIST @@ -71,7 +75,7 @@ add_executable( add_custom_target(script_pb_protocol ALL) add_custom_command(TARGET script_pb_protocol PRE_BUILD - COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=ss_proto,ss_msgid --nohooks 1 + COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=ss_proto,ss_msgid,cs_msgid,cs_proto --python_out=../tools/robot/virtualclient ) add_dependencies(friend_masterserver script_pb_protocol) diff --git a/server/masterserver/cs_msgid.pb.cc b/server/masterserver/cs_msgid.pb.cc deleted file mode 120000 index b8eaa79..0000000 --- a/server/masterserver/cs_msgid.pb.cc +++ /dev/null @@ -1 +0,0 @@ -../imserver/cs_msgid.pb.cc \ No newline at end of file diff --git a/server/masterserver/cs_msgid.pb.h b/server/masterserver/cs_msgid.pb.h deleted file mode 120000 index 5e234fb..0000000 --- a/server/masterserver/cs_msgid.pb.h +++ /dev/null @@ -1 +0,0 @@ -../imserver/cs_msgid.pb.h \ No newline at end of file diff --git a/server/masterserver/cs_proto.pb.cc b/server/masterserver/cs_proto.pb.cc deleted file mode 120000 index 39bf7f9..0000000 --- a/server/masterserver/cs_proto.pb.cc +++ /dev/null @@ -1 +0,0 @@ -../imserver/cs_proto.pb.cc \ No newline at end of file diff --git a/server/masterserver/cs_proto.pb.h b/server/masterserver/cs_proto.pb.h deleted file mode 120000 index 4bd288d..0000000 --- a/server/masterserver/cs_proto.pb.h +++ /dev/null @@ -1 +0,0 @@ -../imserver/cs_proto.pb.h \ No newline at end of file diff --git a/server/masterserver/ss_msgid.pb.cc b/server/masterserver/ss_msgid.pb.cc deleted file mode 120000 index c13a302..0000000 --- a/server/masterserver/ss_msgid.pb.cc +++ /dev/null @@ -1 +0,0 @@ -../imserver/ss_msgid.pb.cc \ No newline at end of file diff --git a/server/masterserver/ss_msgid.pb.h b/server/masterserver/ss_msgid.pb.h deleted file mode 120000 index 6b1101e..0000000 --- a/server/masterserver/ss_msgid.pb.h +++ /dev/null @@ -1 +0,0 @@ -../imserver/ss_msgid.pb.h \ No newline at end of file diff --git a/server/masterserver/ss_proto.pb.cc b/server/masterserver/ss_proto.pb.cc deleted file mode 120000 index 02e6cd8..0000000 --- a/server/masterserver/ss_proto.pb.cc +++ /dev/null @@ -1 +0,0 @@ -../imserver/ss_proto.pb.cc \ No newline at end of file diff --git a/server/masterserver/ss_proto.pb.h b/server/masterserver/ss_proto.pb.h deleted file mode 120000 index a99ba1d..0000000 --- a/server/masterserver/ss_proto.pb.h +++ /dev/null @@ -1 +0,0 @@ -../imserver/ss_proto.pb.h \ No newline at end of file