diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:42:27 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:44:49 -0700 |
| commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
| tree | 195d74745dad40a57d49bf718f50c7751336a405 /objectivec | |
| parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
| parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) | |
| download | protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.gz protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.bz2 protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.zip | |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'objectivec')
| -rw-r--r-- | objectivec/GPBWellKnownTypes.h | 2 | ||||
| -rwxr-xr-x | objectivec/generate_descriptors_proto.sh | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/objectivec/GPBWellKnownTypes.h b/objectivec/GPBWellKnownTypes.h index c98594a2..28442fbe 100644 --- a/objectivec/GPBWellKnownTypes.h +++ b/objectivec/GPBWellKnownTypes.h @@ -30,8 +30,8 @@ #import <Foundation/Foundation.h> -#import "google/protobuf/Timestamp.pbobjc.h" #import "google/protobuf/Duration.pbobjc.h" +#import "google/protobuf/Timestamp.pbobjc.h" NS_ASSUME_NONNULL_BEGIN diff --git a/objectivec/generate_descriptors_proto.sh b/objectivec/generate_descriptors_proto.sh index f2ed00b7..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 @@ -33,10 +32,9 @@ fi # Make sure the compiler is current. cd src -make $@ google/protobuf/stubs/pbconfig.h make $@ protoc -declare -a RUNTIME_PROTO_FILES=(\ +declare -a RUNTIME_PROTO_FILES=( \ google/protobuf/any.proto \ google/protobuf/api.proto \ google/protobuf/descriptor.proto \ @@ -50,5 +48,3 @@ declare -a RUNTIME_PROTO_FILES=(\ google/protobuf/wrappers.proto) ./protoc --objc_out="${ProtoRootDir}/objectivec" ${RUNTIME_PROTO_FILES[@]} - -popd > /dev/null |