From 868060b2925a98a22c4a2e760dd38da0bef6146c Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Mon, 9 Jul 2018 16:06:26 +0200
Subject: Revert "Update protobuf to 3.6.0. Fixes #5439"

This reverts commit a2cac548616e6e6f433df27146c2971f352a4041.
---
 .../protobuf/3.6.0/generate_descriptor_proto.sh    | 123 ---------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 third_party/protobuf/3.6.0/generate_descriptor_proto.sh

(limited to 'third_party/protobuf/3.6.0/generate_descriptor_proto.sh')

diff --git a/third_party/protobuf/3.6.0/generate_descriptor_proto.sh b/third_party/protobuf/3.6.0/generate_descriptor_proto.sh
deleted file mode 100644
index 8a5ed48a2b..0000000000
--- a/third_party/protobuf/3.6.0/generate_descriptor_proto.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-
-# Run this script to regenerate descriptor.pb.{h,cc} after the protocol
-# compiler changes.  Since these files are compiled into the protocol compiler
-# itself, they cannot be generated automatically by a make rule.  "make check"
-# will fail if these files do not match what the protocol compiler would
-# generate.
-#
-# HINT:  Flags passed to generate_descriptor_proto.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
-#   -j4 to run 4 jobs simultaneously.
-
-if test ! -e src/google/protobuf/stubs/common.h; then
-  cat >&2 << __EOF__
-Could not find source code.  Make sure you are running this script from the
-root of the distribution tree.
-__EOF__
-  exit 1
-fi
-
-if test ! -e src/Makefile; then
-  cat >&2 << __EOF__
-Could not find src/Makefile.  You must run ./configure (and perhaps
-./autogen.sh) first.
-__EOF__
-  exit 1
-fi
-
-cd src
-
-declare -a RUNTIME_PROTO_FILES=(\
-  google/protobuf/any.proto \
-  google/protobuf/api.proto \
-  google/protobuf/descriptor.proto \
-  google/protobuf/duration.proto \
-  google/protobuf/empty.proto \
-  google/protobuf/field_mask.proto \
-  google/protobuf/source_context.proto \
-  google/protobuf/struct.proto \
-  google/protobuf/timestamp.proto \
-  google/protobuf/type.proto \
-  google/protobuf/wrappers.proto)
-
-declare -a COMPILER_PROTO_FILES=(\
-  google/protobuf/compiler/plugin.proto)
-
-CORE_PROTO_IS_CORRECT=0
-PROCESS_ROUND=1
-BOOTSTRAP_PROTOC=""
-while [ $# -gt 0 ]; do
-  case $1 in
-    --bootstrap_protoc)
-      BOOTSTRAP_PROTOC=$2
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
-TMP=$(mktemp -d)
-echo "Updating descriptor protos..."
-while [ $CORE_PROTO_IS_CORRECT -ne 1 ]
-do
-  echo "Round $PROCESS_ROUND"
-  CORE_PROTO_IS_CORRECT=1
-
-  if [ "$BOOTSTRAP_PROTOC" != "" ]; then
-    PROTOC=$BOOTSTRAP_PROTOC
-    BOOTSTRAP_PROTOC=""
-  else
-    make $@ protoc
-    if test $? -ne 0; then
-      echo "Failed to build protoc."
-      exit 1
-    fi
-    PROTOC="./protoc"
-  fi
-
-  $PROTOC --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \
-  $PROTOC --cpp_out=dllexport_decl=LIBPROTOC_EXPORT:$TMP ${COMPILER_PROTO_FILES[@]}
-
-  for PROTO_FILE in ${RUNTIME_PROTO_FILES[@]} ${COMPILER_PROTO_FILES[@]}; do
-    BASE_NAME=${PROTO_FILE%.*}
-    diff ${BASE_NAME}.pb.h $TMP/${BASE_NAME}.pb.h > /dev/null
-    if test $? -ne 0; then
-      CORE_PROTO_IS_CORRECT=0
-    fi
-    diff ${BASE_NAME}.pb.cc $TMP/${BASE_NAME}.pb.cc > /dev/null
-    if test $? -ne 0; then
-      CORE_PROTO_IS_CORRECT=0
-    fi
-  done
-
-  # Only override the output if the files are different to avoid re-compilation
-  # of the protoc.
-  if [ $CORE_PROTO_IS_CORRECT -ne 1 ]; then
-    for PROTO_FILE in ${RUNTIME_PROTO_FILES[@]} ${COMPILER_PROTO_FILES[@]}; do
-      BASE_NAME=${PROTO_FILE%.*}
-      mv $TMP/${BASE_NAME}.pb.h ${BASE_NAME}.pb.h
-      mv $TMP/${BASE_NAME}.pb.cc ${BASE_NAME}.pb.cc
-    done
-  fi
-
-  PROCESS_ROUND=$((PROCESS_ROUND + 1))
-done
-cd ..
-
-if test -x objectivec/generate_well_known_types.sh; then
-  echo "Generating messages for objc."
-  objectivec/generate_well_known_types.sh $@
-fi
-
-if test -x csharp/generate_protos.sh; then
-  echo "Generating messages for C#."
-  csharp/generate_protos.sh $@
-fi
-
-if test -x php/generate_descriptor_protos.sh; then
-  echo "Generating messages for PHP."
-  php/generate_descriptor_protos.sh $@
-fi
-- 
cgit v1.2.3