Merge pull request #8185 from y-zeng/gen_proto_comment

Improve gen_reflection_proto.sh
pull/7970/head
Yuchen Zeng 8 years ago committed by GitHub
commit b97f867b39
  1. 2
      include/grpc++/ext/reflection.grpc.pb.h
  2. 2
      include/grpc++/ext/reflection.pb.h
  3. 2
      src/cpp/ext/reflection.grpc.pb.cc
  4. 2
      src/cpp/ext/reflection.pb.cc
  5. 32
      tools/codegen/extensions/gen_reflection_proto.sh

@ -32,7 +32,7 @@
*/ */
// Generated by the gRPC protobuf plugin. // Generated by tools/codegen/extensions/gen_reflection_proto.sh
// If you make any local change, they will be lost. // If you make any local change, they will be lost.
// source: reflection.proto // source: reflection.proto
// Original file comments: // Original file comments:

@ -32,7 +32,7 @@
*/ */
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by tools/codegen/extensions/gen_reflection_proto.sh
// source: reflection.proto // source: reflection.proto
#ifndef PROTOBUF_reflection_2eproto__INCLUDED #ifndef PROTOBUF_reflection_2eproto__INCLUDED

@ -32,7 +32,7 @@
*/ */
// Generated by the gRPC protobuf plugin. // Generated by tools/codegen/extensions/gen_reflection_proto.sh
// If you make any local change, they will be lost. // If you make any local change, they will be lost.
// source: reflection.proto // source: reflection.proto

@ -32,7 +32,7 @@
*/ */
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by tools/codegen/extensions/gen_reflection_proto.sh
// source: reflection.proto // source: reflection.proto
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION

@ -29,20 +29,39 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -e
cd $(dirname $0)/../../..
PROTO_DIR="src/proto/grpc/reflection/v1alpha" PROTO_DIR="src/proto/grpc/reflection/v1alpha"
PROTO_FILE="reflection" PROTO_FILE="reflection"
HEADER_DIR="include/grpc++/ext" HEADER_DIR="include/grpc++/ext"
SRC_DIR="src/cpp/ext" SRC_DIR="src/cpp/ext"
INCLUDE_DIR="grpc++/ext" INCLUDE_DIR="grpc++/ext"
TMP_DIR="tmp" TMP_DIR="tmp"
GRPC_PLUGIN="bins/opt/grpc_cpp_plugin"
PROTOC="bins/opt/protobuf/protoc"
set -e if hash grpc_cpp_plugin 2>/dev/null; then
GRPC_PLUGIN=$(which grpc_cpp_plugin)
else
if [ -f bins/opt/grpc_cpp_plugin ]; then
GRPC_PLUGIN="bins/opt/grpc_cpp_plugin"
else
echo "gRPC protoc plugin not found"
exit 1
fi
fi
TMP_DIR=${TMP_DIR}_${PROTO_FILE} if hash protoc 2>/dev/null; then
PROTOC=$(which protoc)
else
if [ -f bins/opt/protobuf/protoc ]; then
PROTOC="bins/opt/protobuf/protoc"
else
echo "protoc not found"
exit 1
fi
fi
cd $(dirname $0)/../../.. TMP_DIR=${TMP_DIR}_${PROTO_FILE}
[ ! -d $HEADER_DIR ] && mkdir -p $HEADER_DIR || : [ ! -d $HEADER_DIR ] && mkdir -p $HEADER_DIR || :
[ ! -d $SRC_DIR ] && mkdir -p $SRC_DIR || : [ ! -d $SRC_DIR ] && mkdir -p $SRC_DIR || :
@ -56,6 +75,9 @@ sed -i "s/\"${PROTO_FILE}.pb.h\"/<${INCLUDE_DIR/\//\\\/}\/${PROTO_FILE}.pb.h>/g"
sed -i "s/\"${PROTO_FILE}.pb.h\"/<${INCLUDE_DIR/\//\\\/}\/${PROTO_FILE}.pb.h>/g" ${TMP_DIR}/${PROTO_FILE}.grpc.pb.cc sed -i "s/\"${PROTO_FILE}.pb.h\"/<${INCLUDE_DIR/\//\\\/}\/${PROTO_FILE}.pb.h>/g" ${TMP_DIR}/${PROTO_FILE}.grpc.pb.cc
sed -i "s/\"${PROTO_FILE}.grpc.pb.h\"/<${INCLUDE_DIR/\//\\\/}\/${PROTO_FILE}.grpc.pb.h>/g" ${TMP_DIR}/${PROTO_FILE}.grpc.pb.cc sed -i "s/\"${PROTO_FILE}.grpc.pb.h\"/<${INCLUDE_DIR/\//\\\/}\/${PROTO_FILE}.grpc.pb.h>/g" ${TMP_DIR}/${PROTO_FILE}.grpc.pb.cc
sed -i "1s/.*/\/\/ Generated by tools\/codegen\/extensions\/gen_reflection_proto.sh/g" ${TMP_DIR}/*.pb.h
sed -i "1s/.*/\/\/ Generated by tools\/codegen\/extensions\/gen_reflection_proto.sh/g" ${TMP_DIR}/*.pb.cc
/bin/cp LICENSE ${TMP_DIR}/TMP_LICENSE /bin/cp LICENSE ${TMP_DIR}/TMP_LICENSE
sed -i -e "s/./ &/" -e "s/.*/ \*&/" ${TMP_DIR}/TMP_LICENSE sed -i -e "s/./ &/" -e "s/.*/ \*&/" ${TMP_DIR}/TMP_LICENSE
sed -i -r "\$a\ *\n *\/\n\n" ${TMP_DIR}/TMP_LICENSE sed -i -r "\$a\ *\n *\/\n\n" ${TMP_DIR}/TMP_LICENSE

Loading…
Cancel
Save