aboutsummaryrefslogtreecommitdiff
path: root/objectivec
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-07-06 12:29:08 -0400
committerThomas Van Lenten <thomasvl@google.com>2015-08-14 13:34:51 -0400
commit4e43931eaf897d719bc718d5baf1ab84444fdfee (patch)
tree275ae0622f1a867ecefc34db938c0f27102af039 /objectivec
parentedaefac5d2221ab26b9988fb76c79760c6495fb8 (diff)
downloadprotobuf-4e43931eaf897d719bc718d5baf1ab84444fdfee.tar.gz
protobuf-4e43931eaf897d719bc718d5baf1ab84444fdfee.tar.bz2
protobuf-4e43931eaf897d719bc718d5baf1ab84444fdfee.zip
Add support for a file listing expected package to objc prefixes for validation.
- Add a env var to pass a set of expected prefixes for validation. - Report warnings/errors based on the expected prefixes vs. the data in the files compiled. - Use some helpers from common directory.
Diffstat (limited to 'objectivec')
-rwxr-xr-xobjectivec/generate_descriptors_proto.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/objectivec/generate_descriptors_proto.sh b/objectivec/generate_descriptors_proto.sh
index b3ecf398..84ba0738 100755
--- a/objectivec/generate_descriptors_proto.sh
+++ b/objectivec/generate_descriptors_proto.sh
@@ -11,7 +11,6 @@ set -eu
readonly ScriptDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
readonly ProtoRootDir="${ScriptDir}/.."
-readonly ProtoC="${ProtoRootDir}/src/protoc"
pushd "${ProtoRootDir}" > /dev/null
@@ -35,7 +34,7 @@ fi
cd src
make $@ protoc
-declare -a RUNTIME_PROTO_FILES=(\
+declare -a RUNTIME_PROTO_FILES=( \
google/protobuf/any.proto \
google/protobuf/api.proto \
google/protobuf/descriptor.proto \
@@ -49,5 +48,3 @@ declare -a RUNTIME_PROTO_FILES=(\
google/protobuf/wrappers.proto)
./protoc --objc_out="${ProtoRootDir}/objectivec" ${RUNTIME_PROTO_FILES[@]}
-
-popd > /dev/null