diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
| commit | 814685ca2cd9280ca401e1842fd6311440921a0a (patch) | |
| tree | 5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /generate_descriptor_proto.sh | |
| parent | 3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff) | |
| parent | 3c4ce528c63f4dc39d15de963020472980ee7229 (diff) | |
| download | protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.gz protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.bz2 protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.zip | |
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'generate_descriptor_proto.sh')
| -rwxr-xr-x | generate_descriptor_proto.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh index 1690d0da..c170c837 100755 --- a/generate_descriptor_proto.sh +++ b/generate_descriptor_proto.sh @@ -10,8 +10,6 @@ # to make when building protoc. This is particularly useful for passing # -j4 to run 4 jobs simultaneously. -set -e - 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 @@ -52,9 +50,14 @@ do echo "Round $PROCESS_ROUND" CORE_PROTO_IS_CORRECT=1 - make $@ protoc && - ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \ - ./protoc --cpp_out=dllexport_decl=LIBPROTOC_EXPORT:$TMP google/protobuf/compiler/plugin.proto + make $@ protoc + if test $? -ne 0; then + echo "Failed to build protoc." + exit 1 + fi + + ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \ + ./protoc --cpp_out=dllexport_decl=LIBPROTOC_EXPORT:$TMP google/protobuf/compiler/plugin.proto for PROTO_FILE in ${RUNTIME_PROTO_FILES[@]}; do BASE_NAME=${PROTO_FILE%.*} |